质量 缺陷类型 NC处理

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesDefectRecordService.java

@@ -36,15 +36,15 @@ public class MesDefectRecordService implements IMesDefectRecordService {
 //        //校验工单
 //        MesWorkOrder workOrder = checkQty(recordList);
 
-        recordList.forEach(r -> {
+//        recordList.forEach(r -> {
-            r.setId(null);
+//            r.setId(null);
-//            r.setOrderId(workOrder.getId());
+////            r.setOrderId(workOrder.getId());
-//            r.setOrderNo(workOrder.getOrderNo());
+////            r.setOrderNo(workOrder.getOrderNo());
-            r.setOrganizeCode(organizeCode);
+//            r.setOrganizeCode(organizeCode);
-            //更新工单表报废数量
+//            //更新工单表报废数量
-//            workOrder.setRepairQty(workOrder.getRepairQtyVal() + r.getQty());
+////            workOrder.setRepairQty(workOrder.getRepairQtyVal() + r.getQty());
-            ConvertBean.serviceModelInitialize(r, userName);
+//            ConvertBean.serviceModelInitialize(r, userName);
-        });
+//        });
         defectRecordRepository.saveAll(recordList);
 
 //        ConvertBean.serviceModelUpdate(workOrder, userName);

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java

@@ -172,6 +172,18 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
         DdlPreparedPack.getStringEqualPack(produceSn.getPartNo(), "partNo", packBean);
         MesPart part = partRepository.getByProperty(packBean);
 
+        defectRecordList.forEach(r -> {
+            r.setId(null);
+            r.setPartNo(part.getPartNo());
+            r.setPartName(part.getPartName());
+////            r.setOrderId(workOrder.getId());
+////            r.setOrderNo(workOrder.getOrderNo());
+            r.setOrganizeCode(org);
+//            //更新工单表报废数量
+////            workOrder.setRepairQty(workOrder.getRepairQtyVal() + r.getQty());
+            ConvertBean.serviceModelInitialize(r, AuthUtil.getSessionUser().getUserName());
+        });
+
         //保存数据
         defectRecordService.saveDefect(org, AuthUtil.getSessionUser().getUserName(), defectRecordList);