diff --git a/app/src/main/java/com/example/beijing_daxing/FpInActivity.java b/app/src/main/java/com/example/beijing_daxing/FpInActivity.java index 540e81e..7577ddd 100644 --- a/app/src/main/java/com/example/beijing_daxing/FpInActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/FpInActivity.java @@ -59,7 +59,6 @@ public class FpInActivity extends BaseActivity { public void fpin_submit(View view){ Log.e("TAG", "onSuccess:" +vm.toString() ); - var state = vm.getState(); if (!state.equals("报废")){ Toast.makeText(this, "轮挡状态:"+state+",不能使用废品入库功能", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/example/beijing_daxing/been/Stock.java b/app/src/main/java/com/example/beijing_daxing/been/Stock.java index ff917c0..1648b21 100644 --- a/app/src/main/java/com/example/beijing_daxing/been/Stock.java +++ b/app/src/main/java/com/example/beijing_daxing/been/Stock.java @@ -1,17 +1,37 @@ package com.example.beijing_daxing.been; +import androidx.databinding.BaseObservable; + import java.util.Objects; /** * @author wanghao * @date 2024/1/19 13:45 */ -public class Stock { +public class Stock extends BaseObservable { private int index; private String epcCode; private String locationCode; private String state; + private String createTime; + private String remark; + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + notifyChange(); + } + + public String getCreateTime() { + return createTime; + } + public void setCreateTime(String createTime) { + this.createTime = createTime; + } public String getState() { return state; } diff --git a/app/src/main/res/layout/item_check.xml b/app/src/main/res/layout/item_check.xml new file mode 100644 index 0000000..391b766 --- /dev/null +++ b/app/src/main/res/layout/item_check.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index a6de5f2..51aa08a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -9,8 +9,14 @@ + +