diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java b/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java index f904616..5089aa3 100644 --- a/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java +++ b/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java @@ -34,7 +34,7 @@ public class CheckResultDetal extends BaseObservable { /** * 检验结果,具体值 */ - private double checkProjectResult; + private String checkProjectResult; /** * 检验项目顺序 */ @@ -168,11 +168,11 @@ public class CheckResultDetal extends BaseObservable { this.checkProjectStatus = checkProjectStatus; } - public double getCheckProjectResult() { + public String getCheckProjectResult() { return checkProjectResult; } - public void setCheckProjectResult(double checkProjectResult) { + public void setCheckProjectResult(String checkProjectResult) { this.checkProjectResult = checkProjectResult; } @@ -252,7 +252,7 @@ public class CheckResultDetal extends BaseObservable { } public void textChanged(Editable s){ double result=Double.parseDouble(s.toString()); - checkProjectResult=result; + checkProjectResult=result+""; if (result>=downDiff && result<= upperDiff){ setCheckProjectStatus("1"); diff --git a/app/src/main/java/com/example/jingyuan_mes/store/InventoryTaskCreateActivity.java b/app/src/main/java/com/example/jingyuan_mes/store/InventoryTaskCreateActivity.java index 5389588..90fbecd 100644 --- a/app/src/main/java/com/example/jingyuan_mes/store/InventoryTaskCreateActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/store/InventoryTaskCreateActivity.java @@ -43,7 +43,7 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter private List list; private Map map; private int pageNum = 1; - private int pageSize = 1; + private int pageSize = 10; private int warehouseId; private Intent intent; private String warehouseName; @@ -66,12 +66,13 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter var inventoryCheckId = intent.getIntExtra("inventoryCheckId", -1); map.put("inventoryCheckId", inventoryCheckId == -1 ? null : inventoryCheckId); warehouseId = intent.getIntExtra("warehouseId", 0); + Log.e("TAG", "传递的值:" + warehouseId); if (warehouseId == 0) { initRequest(); } else { warehouseName = intent.getStringExtra("warehouseName"); list.clear(); - createLocation(1); + createLocation(1,true); } } @@ -107,14 +108,14 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter lpw.dismiss(); pageNum = 1; warehouseName = warehouseBeen.getWarehouseName(); - createLocation(pageNum); + createLocation(pageNum,true); } private int total; // 请求库位 - private void createLocation(int pageNum) { + private void createLocation(int pageNum,boolean state) { binding.inventoryCreateHouse.setText(warehouseName); map.put("warehouseId", warehouseId); OkGo.get(url + "/wms/mobile/getLocations").tag(this) @@ -136,7 +137,12 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter Toast.makeText(context, body.getCode() == 200 ? "暂无记录" : body.getMsg(), Toast.LENGTH_SHORT).show(); return; } + //显示下拉刷新ui binding.inventoryCreateRefresh.finishLoadMore(500); + if (state){ + //切换仓库的 需要清理 + list.clear(); + } list.addAll(gson.fromJson(gson.toJson(body.getRows()), new TypeToken>() { }.getType())); adapter.notifyDataSetChanged(); @@ -185,7 +191,7 @@ public class InventoryTaskCreateActivity extends BaseActivity implements Adapter return; } pageNum++; - createLocation(pageNum); + createLocation(pageNum,false); Log.e("TAG", "onLoadMore"); } } \ No newline at end of file diff --git a/app/src/main/res/layout/item_check_2.xml b/app/src/main/res/layout/item_check_2.xml index 3da062d..7e56f57 100644 --- a/app/src/main/res/layout/item_check_2.xml +++ b/app/src/main/res/layout/item_check_2.xml @@ -43,7 +43,7 @@ android:inputType="number" android:enabled="@{enabledState}" android:afterTextChanged="@{item.textChanged}" - android:text='@={item.checkProjectResult+""}' /> + android:text='@={item.checkProjectResult}' /> + android:text="物料条码:" />