From cd70e560a0621d5b00c2ea48bf9fb27ab0649bdf Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 25 Nov 2024 15:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=92=8C=E8=B4=A8=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jingyuan_mes/HomePageActivity.java | 6 +- .../device/DeviceRepairInfoActivity.java | 52 ++++++++++----- .../entity/check/CheckResultDetal.java | 4 +- .../store/AssemblyOutActivity.java | 4 +- .../jingyuan_mes/store/SemiActivity.java | 65 ++++++++++--------- app/src/main/res/layout/activity_check.xml | 8 +-- .../layout/activity_check_select_detal.xml | 5 +- app/src/main/res/layout/item_check_2.xml | 5 +- 8 files changed, 88 insertions(+), 61 deletions(-) diff --git a/app/src/main/java/com/example/jingyuan_mes/HomePageActivity.java b/app/src/main/java/com/example/jingyuan_mes/HomePageActivity.java index 05a2502..8e9b983 100644 --- a/app/src/main/java/com/example/jingyuan_mes/HomePageActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/HomePageActivity.java @@ -68,9 +68,9 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall { map.put("原材料入库", MaterialInActivity.class); map.put("原材料出库审批", MaterialOutListActivity.class); map.put("原材料出库", MaterialPassActivity.class); - map.put("组装出库", AssemblyOutActivity.class); + map.put("出库组装", AssemblyOutActivity.class); map.put("组装返库", AssemblyOutActivity.class); - map.put("生产入库", AssemblyOutActivity.class); + map.put("组装入库", AssemblyOutActivity.class); map.put("原材料退库审批", StockreturnActivity.class); map.put("原材料退库", StockreturnConfirmActivity.class); map.put("成品入库", ProductInActivity.class); @@ -138,7 +138,7 @@ public class HomePageActivity extends BaseActivity implements ItemClickCall { if (cls==null) return; var intent = new Intent(this, cls); if (menuName.equals("物料质检列表")||menuName.equals("不合格处置") - ||menuName.equals("组装出库")||menuName.equals("组装返库")||menuName.equals("生产入库") + ||menuName.equals("出库组装")||menuName.equals("组装返库")||menuName.equals("组装入库") ||menuName.equals("人工移库")||menuName.equals("人工合库")){ intent.putExtra("title",menuName); } diff --git a/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java b/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java index 45e152b..efe16cd 100644 --- a/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java @@ -108,10 +108,10 @@ public class DeviceRepairInfoActivity extends BaseActivity { }); // 显示维修完成的图片 var dmsInstanceFiles1 = deviceRepair.getDmsInstanceFiles1(); - if (dmsInstanceFiles1==null || dmsInstanceFiles1.isEmpty()){ + if (dmsInstanceFiles1 == null || dmsInstanceFiles1.isEmpty()) { overRepairLookList = new ArrayList<>(); - }else { - dmsInstanceFiles1.stream().forEach(t->{ + } else { + dmsInstanceFiles1.stream().forEach(t -> { CheckInstanceFiles files = new CheckInstanceFiles(); files.setFaultFile(t.getFilePath()); files.setState(false); @@ -284,18 +284,40 @@ public class DeviceRepairInfoActivity extends BaseActivity { // 完成维修 public void endRepair(View view) { - OkGo.post(url + "/dms/mobile/completeRepair").headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")).params("repairInstanceId", deviceRepair.getRepairInstanceId()).params("instanceActivityId", deviceRepair.getInstanceActivityId()).params("designOperations", deviceRepair.getDesignOperations()).params("faultType", deviceRepair.getFaultSourceType()).params("processHandleResolution", deviceRepair.getProcessHandleResolution()).params("repairType", deviceRepair.getRepairType()).params("outsrcId", deviceRepair.getOutsrcId()).params("repairContent", deviceRepair.getRepairContent()).params("protectedMethod", deviceRepair.getProtectedMethod()).params("repairer", SharedPreferencesUtils.getstring("user", "")).params("parts1", gson.toJson(deviceRepair.getParts())).addFileParams("files", submitFileList).execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - MyResult body = response.body(); - if (body.getCode() == 200) { - submitFileList.forEach(File::delete); - finish(); - } else { - myToastUitls.show(body.getMsg()); - } - } - }); + // try { + // Log.e("TAG", "repairInstanceId" + deviceRepair.getRepairInstanceId()); + // Log.e("TAG", "instanceActivityId" + deviceRepair.getInstanceActivityId()); + + OkGo.post(url + "/dms/mobile/completeRepair") + .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) + .params("repairInstanceId", deviceRepair.getRepairInstanceId()) + .params("instanceActivityId", deviceRepair.getInstanceActivityId()) + .params("designOperations", deviceRepair.getDesignOperations()) + .params("faultType", deviceRepair.getFaultSourceType()) + .params("processHandleResolution", deviceRepair.getProcessHandleResolution()) + .params("repairType", deviceRepair.getRepairType()) + .params("outsrcId", deviceRepair.getOutsrcId()) + .params("repairContent", deviceRepair.getRepairContent()) + .params("protectedMethod", deviceRepair.getProtectedMethod()) + .params("repairer", SharedPreferencesUtils.getstring("user", "")) + .params("parts1", gson.toJson(deviceRepair.getParts())) + .addFileParams("files", submitFileList) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + MyResult body = response.body(); + if (body.getCode() == 200) { + submitFileList.forEach(File::delete); + // finish(); + } else { + myToastUitls.show(body.getMsg()); + } + } + }); + // } catch (Exception e) { + // e.printStackTrace(); + // } + } // 选择故障类别 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 5089aa3..da458e9 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 @@ -226,7 +226,8 @@ public class CheckResultDetal extends BaseObservable { public String getCheckStatusShow() { if (checkProjectStatus==null||checkProjectStatus.isEmpty()){ - setCheckStatusShow("未检验"); + setCheckStatusShow(""); + // setCheckStatusShow("未检验"); }else if (checkProjectStatus.equals("1")){ setCheckStatusShow("合格"); } else if (checkProjectStatus.equals("0")) { @@ -254,7 +255,6 @@ public class CheckResultDetal extends BaseObservable { double result=Double.parseDouble(s.toString()); checkProjectResult=result+""; if (result>=downDiff && result<= upperDiff){ - setCheckProjectStatus("1"); }else { setCheckProjectStatus("0"); diff --git a/app/src/main/java/com/example/jingyuan_mes/store/AssemblyOutActivity.java b/app/src/main/java/com/example/jingyuan_mes/store/AssemblyOutActivity.java index 275a2e4..0256573 100644 --- a/app/src/main/java/com/example/jingyuan_mes/store/AssemblyOutActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/store/AssemblyOutActivity.java @@ -34,13 +34,13 @@ public class AssemblyOutActivity extends BaseActivity { binding = DataBindingUtil.setContentView(this, R.layout.activity_assembly_out); title = getIntent().getStringExtra("title"); switch (title){ - case "组装出库" : + case "出库组装" : uri="assembleOutstock"; break; case "组装返库" : uri="assembleBack"; break; - case "生产入库" : + case "组装入库" : uri="produceInstock"; break; diff --git a/app/src/main/java/com/example/jingyuan_mes/store/SemiActivity.java b/app/src/main/java/com/example/jingyuan_mes/store/SemiActivity.java index ef27131..88b32e7 100644 --- a/app/src/main/java/com/example/jingyuan_mes/store/SemiActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/store/SemiActivity.java @@ -31,14 +31,15 @@ public class SemiActivity extends BaseActivity { private List list; public ObservableField locationCode; public ObservableField proCode; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ActivitySemiBinding binding= DataBindingUtil.setContentView(this,R.layout.activity_semi); - adapter=new ItemSemiAdapter(this); + ActivitySemiBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_semi); + adapter = new ItemSemiAdapter(this); binding.setAdapter(adapter); - locationCode=new ObservableField<>(); - proCode=new ObservableField<>(); + locationCode = new ObservableField<>(); + proCode = new ObservableField<>(); binding.setVm(this); binding.semiLocation.addTextChangedListener(new TextWatcher() { @Override @@ -60,49 +61,53 @@ public class SemiActivity extends BaseActivity { } }); - initRequest(); + initRequest(); } private void initRequest() { OkGo.get(url + "/wms/mobile/getTransfers").tag(this) .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) .execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - var body = response.body(); - if (body.getTotal()==0) { - if (list != null) { - list.clear(); + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getTotal() == 0) { + if (list != null) { + list.clear(); + adapter.notifyDataSetChanged(); + } + myToastUitls.show(body.getCode() == 200 ? "暂无记录" : body.getMsg()); + return; + } + list = gson.fromJson(gson.toJson(body.getRows()), new TypeToken>() { + }.getType()); + adapter.setList(list); adapter.notifyDataSetChanged(); } - myToastUitls.show( body.getCode() == 200 ? "暂无记录" : body.getMsg()); - return; - } - list = gson.fromJson(gson.toJson(body.getRows()), new TypeToken>() {}.getType()); - adapter.setList(list); - adapter.notifyDataSetChanged(); - } - }); + }); } - public void submit(boolean b){ - Map map=new HashMap<>(); - map.put("locationCode",locationCode.get()); - map.put("materialBarcode",proCode.get()); - OkGo.post(url+"/wms/mobile/"+(b?"transferOutstock":"transferInstock")) + + public void submit(boolean b) { + Map map = new HashMap<>(); + map.put("locationCode", locationCode.get()); + map.put("materialBarcode", proCode.get()); + OkGo.post(url + "/wms/mobile/" + (b ? "transferOutstock" : "transferInstock")) .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) - .upRequestBody(RequestBody.create(JSON,gson.toJson(map))) - .execute(new MyRecultCall(dialog,this){ + .upRequestBody(RequestBody.create(JSON, gson.toJson(map))) + .execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { super.onSuccess(response); var body = response.body(); - if (body.getCode()==200){ - initRequest(); + if (body.getCode() == 200) { + locationCode.set(null); + proCode.set(null); + initRequest(); } - myToastUitls.show( body.getMsg()); + myToastUitls.show(body.getMsg()); } }); diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml index b746829..9462d7f 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -187,12 +187,12 @@ + android:background="@color/white" + android:padding="5dp" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> +