Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -1047,17 +1047,17 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
 //            return R.error(r.getMsg());
 //        }
 
-            //查询新的输出物料
-            List<ApsReportOutputDo> newOutputDos = apsReportOutputService.list(new QueryWrapper<ApsReportOutputDo>().lambda().eq(ApsReportOutputDo::getMainid, apsReportRecordsDo.getId()));
-            //填补对应的检验等级和是否合格
-            if (apsReportOutputDoList.size() == newOutputDos.size()) {
-                for (int i = 0; i < newOutputDos.size(); i++) {
-                    newOutputDos.get(i).setInsepctionlevel(apsReportOutputDoList.get(i).getInsepctionlevel());
-                    newOutputDos.get(i).setQualified(apsReportOutputDoList.get(i).getQualified());
-                }
-            }
-            //更新输出物料
-            apsReportOutputService.updateBatchById(newOutputDos);
+//            //查询新的输出物料
+//            List<ApsReportOutputDo> newOutputDos = apsReportOutputService.list(new QueryWrapper<ApsReportOutputDo>().lambda().eq(ApsReportOutputDo::getMainid, apsReportRecordsDo.getId()));
+//            //填补对应的检验等级和是否合格
+//            if (apsReportOutputDoList.size() == newOutputDos.size()) {
+//                for (int i = 0; i < newOutputDos.size(); i++) {
+//                    newOutputDos.get(i).setInsepctionlevel(apsReportOutputDoList.get(i).getInsepctionlevel());
+//                    newOutputDos.get(i).setQualified(apsReportOutputDoList.get(i).getQualified());
+//                }
+//            }
+//            //更新输出物料
+//            apsReportOutputService.updateBatchById(newOutputDos);
 
             //=================新增在制品库存=================
             //查询报工记录对应的物料子表