aps-作业报工表单增加坯料成分子表

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

@@ -151,7 +151,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                 //查询所有同级工序
                 List<ApsProcessOperationDo> list = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getPreviousprocessid, apsProcessOperationDo.getPreviousprocessid()));
                 List<String> processIdList = list.stream().map(ApsProcessOperationDo::getId).collect(Collectors.toList());
-                if(StringUtils.isNotBlank(recordsDo.getBatchnumber())){
+                if (StringUtils.isNotBlank(recordsDo.getBatchnumber())) {
                     //更新所有同级工序作业的明细，增加批次号
                     apsProcessOperationDao.updateBatchNumberByProcessList(recordsDo.getBatchnumber(), processIdList);
                 }
@@ -365,6 +365,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         List<ApsReportOutputDo> apsReportOutputDoList = req.getApsReportOutputDoList();
         //报工加工参数
         List<ApsReportMachiningDo> apsReportMachiningDoList = req.getApsReportMachiningDoList();
+        //报工坯料成分
+        List<ApsReportBlankCompentDo> apsReportBlankCompentDoList = req.getApsReportBlankCompentDoList();
 
         //没有新增，只会更新
         apsReportRecordsDo.setCheckstatus("待检验");
@@ -375,6 +377,9 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         if (ObjectUtil.isNotEmpty(apsReportMachiningDoList)) {
             apsReportMachiningService.updateBatchById(apsReportMachiningDoList);
         }
+        if (ObjectUtil.isNotEmpty(apsReportBlankCompentDoList)) {
+            apsReportBlankCompentService.updateBatchById(apsReportBlankCompentDoList);
+        }
 
         //查询当前的报工记录信息
         ApsReportRecordsDo nowReportRecordsDo = this.getById(apsReportRecordsDo.getId());
@@ -405,12 +410,12 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         Integer planprocessrall = apsProcessOperationProcessEquDo.getPlanprocessrall();
         //未完工卷数=计划加工卷数-已报工卷数
         int unfinishroll = planprocessrall - needUpdateProcessOperationProcessEquDo.getReportroll();
-        if(unfinishroll <= 0 || apsProcessOperationDo.getClosestatus().equals("已完工")){
+        if (unfinishroll <= 0 || apsProcessOperationDo.getClosestatus().equals("已完工")) {
             needUpdateProcessOperationProcessEquDo.setClosestatus("已完工");
             //已完工时更新完工时间
             needUpdateProcessOperationProcessEquDo.setActualfinishdate(DateUtil.date());
         }
-        if(unfinishroll > 0 && apsProcessOperationDo.getClosestatus().equals("未完工")){
+        if (unfinishroll > 0 && apsProcessOperationDo.getClosestatus().equals("未完工")) {
             needUpdateProcessOperationProcessEquDo.setClosestatus("未完工");
         }
 
@@ -480,7 +485,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             if (ObjectUtil.isNotEmpty(apsReportRecordsDo.getBatchnumber())) {
                 ApsWorkInProgressInventoryDo apsWorkInProgressInventoryDo = apsWorkInProgressInventoryService.getOne(new QueryWrapper<ApsWorkInProgressInventoryDo>().lambda().eq(ApsWorkInProgressInventoryDo::getDeleted, "0").eq(ApsWorkInProgressInventoryDo::getBatchnumber, apsReportRecordsDo.getBatchnumber()));
                 //不为空，则删除数据（逻辑删除）
-                if(ObjectUtil.isNotEmpty(apsWorkInProgressInventoryDo)){
+                if (ObjectUtil.isNotEmpty(apsWorkInProgressInventoryDo)) {
                     apsWorkInProgressInventoryService.removeById(apsWorkInProgressInventoryDo.getId());
                 }
                 //增加或者复制在制品库存

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/SaveReportReq.java

@@ -1,5 +1,6 @@
 package com.rongwei.bsentity.vo;
 
+import com.rongwei.bsentity.domain.ApsReportBlankCompentDo;
 import com.rongwei.bsentity.domain.ApsReportMachiningDo;
 import com.rongwei.bsentity.domain.ApsReportOutputDo;
 import com.rongwei.bsentity.domain.ApsReportRecordsDo;
@@ -19,4 +20,6 @@ public class SaveReportReq {
     private List<ApsReportOutputDo> apsReportOutputDoList;
     //报工记录加工参数子表
     private List<ApsReportMachiningDo> apsReportMachiningDoList;
+    //报工记录坯料成分子表
+    private List<ApsReportBlankCompentDo> apsReportBlankCompentDoList;
 }