Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/daywork/index.vue

@@ -377,6 +377,9 @@ function getProcess() {
   //工序下拉框
   getProcessList({
     technologicalProcessId: queryItemParams.value.technologicalProcessId,
+    isWasteRecycling:currentDaywork.value.isWasteRecycling,
+    isAmend:currentDaywork.value.isAmend,
+    lotId:currentDaywork.value.lotId
   }).then((res) => {
     processList.value = res.data;
   });

src/views/business/reviseBath/lotFormParticulars.vue

@@ -348,21 +348,26 @@ function handleStandardProcess(processId) {
 //批废
 function handlelotWaste(lotCode) {
   if (lot.value.daywork) {
-    let row = {};
-    row.lotCode = lotCode;
-    row.lotId = lot.value.id;
-    row.companyAlias = lot.value.productionPlanDetail.companyAlias;
-    row.productionPlanNo = lot.value.productionPlanDetail.productionPlanNo;
-    row.productDescription = lot.value.productionPlanDetail.productDescription;
-    row.technologyVersion = lot.value.technologyVersion;
-    row.productionQuantity = lot.value.productionQuantity;
-    row.createTime = lot.value.daywork.createTime;
-    row.id = lot.value.daywork.id;
-    row.isWaste = lot.value.isWaste;
-    row.deptName = lot.value.daywork.deptName;
-    row.temporaryProcessQualifiedNum =
-      lot.value.daywork.temporaryProcessQualifiedNum;
-    proxy.$refs.lotWasteDialogRef.open(row);
+    if (lot.value.daywork.status == 0) {
+      proxy.$modal.msgError("该批已领料，不能进行批废");
+    } else {
+      let row = {};
+      row.lotCode = lotCode;
+      row.lotId = lot.value.id;
+      row.companyAlias = lot.value.productionPlanDetail.companyAlias;
+      row.productionPlanNo = lot.value.productionPlanDetail.productionPlanNo;
+      row.productDescription =
+        lot.value.productionPlanDetail.productDescription;
+      row.technologyVersion = lot.value.technologyVersion;
+      row.productionQuantity = lot.value.productionQuantity;
+      row.createTime = lot.value.daywork.createTime;
+      row.id = lot.value.daywork.id;
+      row.isWaste = lot.value.isWaste;
+      row.deptName = lot.value.daywork.deptName;
+      row.temporaryProcessQualifiedNum =
+        lot.value.daywork.temporaryProcessQualifiedNum;
+      proxy.$refs.lotWasteDialogRef.open(row);
+    }
   } else {
     proxy.$modal.msgError("该批未投产，不能进行批废");
   }