diff --git a/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java b/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java index ca87dd7..3968476 100644 --- a/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java @@ -46,8 +46,9 @@ public class CheckActivity extends BaseActivity { searchRequest(null, id, visble); } } - + // 提交 public void checkSubmit(View view) { + checkResult.setMaterialBarcode(binding.checkSearchText.getText().toString()); OkGo.post(url + "/qms/mobile/saveCheckResultDetail") .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) .upRequestBody(RequestBody.create(JSON, gson.toJson(checkResult))) @@ -91,11 +92,10 @@ public class CheckActivity extends BaseActivity { qmsCheckResultDetailProjectList = new ArrayList<>(); var qmsCheckRuleProjectList = checkResult.getQmsCheckRuleProjectList(); qmsCheckResultDetailProjectList.addAll(qmsCheckRuleProjectList); + checkResult.setQmsCheckResultDetailProjectList(qmsCheckResultDetailProjectList); } - adapter.setList(qmsCheckResultDetailProjectList); adapter.notifyDataSetChanged(); - } else { binding.setVm(null); adapter.setList(null); diff --git a/app/src/main/java/com/example/jingyuan_mes/check/CheckDisposalActivity.java b/app/src/main/java/com/example/jingyuan_mes/check/CheckDisposalActivity.java index 8c635ac..e9a29d6 100644 --- a/app/src/main/java/com/example/jingyuan_mes/check/CheckDisposalActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/check/CheckDisposalActivity.java @@ -90,7 +90,6 @@ public class CheckDisposalActivity extends BaseActivity implements DisposalFileA if (body.getCode() == 200) { CheckDisposalBeen been = gson.fromJson(body.getData().toString(), CheckDisposalBeen.class); binding.setVm(been); - infoList = been.getQmsQualityInstanceActivities(); infoAdapter.setList(infoList); infoAdapter.notifyDataSetChanged(); @@ -149,8 +148,14 @@ public class CheckDisposalActivity extends BaseActivity implements DisposalFileA public void checkDisposalSubmit(View view) { var been = infoList.get(infoList.size() - 1); - OkGo.post(url + "/qms/mobile/handleQualityInstance").headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) - .params("checkResultId", checkResultId).params("processActivityId", been.getProcessActivityId()).params("processHandleResolution", been.getProcessHandleResolution()).params("processStepOrder", been.getProcessStepOrder()).addFileParams("files", files).execute(new MyRecultCall(dialog, this) { + OkGo.post(url + "/qms/mobile/handleQualityInstance") + .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) + .params("checkResultId", checkResultId) + .params("processActivityId", been.getProcessActivityId()) + .params("processHandleResolution", been.getProcessHandleResolution()) + .params("processStepOrder", been.getProcessStepOrder()) + .addFileParams("files", files) + .execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { super.onSuccess(response); diff --git a/app/src/main/java/com/example/jingyuan_mes/device/BxActivity.java b/app/src/main/java/com/example/jingyuan_mes/device/BxActivity.java index 595d015..1e03ea6 100644 --- a/app/src/main/java/com/example/jingyuan_mes/device/BxActivity.java +++ b/app/src/main/java/com/example/jingyuan_mes/device/BxActivity.java @@ -178,7 +178,8 @@ public class BxActivity extends BaseActivity implements DisposalFileAdapter.Item } public void bxSubmit(View view) { - OkGo.post(url + "/dms/mobile/insertFaultinstsanceActivity") + + OkGo.post(url + "/dms/mobile/insertFaultInstsanceActivity") .headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")) .params("checkResultId", been.getDeviceld()) .params("faultType", been.getFaultType())