aps-开工时增加空校验

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

@@ -549,22 +549,24 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             String inputBatchNumber = req.getInputBatchNumber();
             //查询上一个的报工ID
             String lastReportRecordId = this.baseMapper.selectLastReoprtRecordByBatchNumber(inputBatchNumber);
-            //查询上一个报工的坯料成分
-            List<ApsReportBlankCompentDo> apsReportBlankCompentDoList = apsReportBlankCompentService.list(new QueryWrapper<ApsReportBlankCompentDo>().lambda().eq(ApsReportBlankCompentDo::getMainid, lastReportRecordId));
-            //复制新增
-            List<ApsReportBlankCompentDo> needAddList = new LinkedList<>();
-            for (ApsReportBlankCompentDo apsReportBlankCompentDo : apsReportBlankCompentDoList) {
-                ApsReportBlankCompentDo needAdd = new ApsReportBlankCompentDo();
-                needAdd.setId(SecurityUtil.getUUID());
-                needAdd.setTenantid(tenantId);
-                needAdd.setMainid(apsReportRecordsDo.getId());
-                needAdd.setCompent(apsReportBlankCompentDo.getCompent());
-                needAdd.setStartproportion(apsReportBlankCompentDo.getStartproportion());
-                needAdd.setEndproportion(apsReportBlankCompentDo.getEndproportion());
-                needAdd.setActualproportion(apsReportBlankCompentDo.getActualproportion());
-                needAddList.add(needAdd);
+            if(ObjectUtil.isNotEmpty(lastReportRecordId)) {
+                //查询上一个报工的坯料成分
+                List<ApsReportBlankCompentDo> apsReportBlankCompentDoList = apsReportBlankCompentService.list(new QueryWrapper<ApsReportBlankCompentDo>().lambda().eq(ApsReportBlankCompentDo::getMainid, lastReportRecordId));
+                //复制新增
+                List<ApsReportBlankCompentDo> needAddList = new LinkedList<>();
+                for (ApsReportBlankCompentDo apsReportBlankCompentDo : apsReportBlankCompentDoList) {
+                    ApsReportBlankCompentDo needAdd = new ApsReportBlankCompentDo();
+                    needAdd.setId(SecurityUtil.getUUID());
+                    needAdd.setTenantid(tenantId);
+                    needAdd.setMainid(apsReportRecordsDo.getId());
+                    needAdd.setCompent(apsReportBlankCompentDo.getCompent());
+                    needAdd.setStartproportion(apsReportBlankCompentDo.getStartproportion());
+                    needAdd.setEndproportion(apsReportBlankCompentDo.getEndproportion());
+                    needAdd.setActualproportion(apsReportBlankCompentDo.getActualproportion());
+                    needAddList.add(needAdd);
+                }
+                apsReportBlankCompentService.saveBatch(needAddList);
             }
-            apsReportBlankCompentService.saveBatch(needAddList);
         }
         //更新生产状态
         CommonUpdateProductionStatusReq req3 = new CommonUpdateProductionStatusReq();