更新后续工序作业

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

@@ -2,7 +2,7 @@ package com.rongwei.bscommon.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.ApsProcessOperationDo;
-import com.rongwei.bsentity.domain.ApsProcessOperationOutMaterDo;
+import com.rongwei.bsentity.vo.ResetProcessOperationVo;
 import com.rongwei.rwcommon.base.R;
 
 import java.util.List;
@@ -37,7 +37,7 @@ public interface ApsProcessOperationService extends IService<ApsProcessOperation
     /*
     更新后面所有工序信息
      */
-    R resetProcessOperation(Map<String, Object> params);
+    R resetProcessOperation(ResetProcessOperationVo params);
 
     R updateBorrowProcess(Map<String, Object> params);
 

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

@@ -14,6 +14,7 @@ import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.vo.CommonUpdateProductionStatusReq;
 import com.rongwei.bsentity.vo.PreviousProcessVo;
 import com.rongwei.bsentity.vo.ProcessIdRelationVo;
+import com.rongwei.bsentity.vo.ResetProcessOperationVo;
 import com.rongwei.commonservice.service.SysMindMappingService;
 import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
 import com.rongwei.rwadmincommon.system.service.SysOrganizationService;
@@ -1174,19 +1175,19 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
      */
     @Override
     @Transactional
-    public R resetProcessOperation(Map<String, Object> params) {
+    public R resetProcessOperation(ResetProcessOperationVo params) {
         List<ApsProcessOperationOutMaterDo> operationOutMaterDos = new ArrayList<>();//递归的数据源
         try {
-            List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList = (List<ApsProcessOperationOutMaterDo>) params.get("OUTMETERINFO");
+            List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList = params.getOutmeterinfo();
             // 获取排程参数设置
             List<ApsScheduleConfigDo> apsConfigs = apsScheduleConfigService.list();
             BigDecimal aluminumdensity = apsConfigs.get(0).getAluminumdensity();
 
-            ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(params.get("BLANKID").toString());
+            ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(params.getBlankid());
             String craftrouteid = apsBlankOrderDo.getCraftrouteid();
             //该坯料计划所有的工序及输出
             Map<String, Object> map = new HashMap<>();
-            map.put("BLANKID", params.get("BLANKID").toString());
+            map.put("BLANKID", params.getBlankid());
             List<ApsProcessOperationDo> processOperationDoList = apsProcessOperationService.listByMap(map).stream().collect(Collectors.toList());
             List<ApsProcessOperationOutMaterDo> processOperationOutMaterDoList = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
 
@@ -1340,8 +1341,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             if (bool1 && bool2) {
                 if (operationOutMaterDos.size() > 0) {
-                    Map<String, Object> resetmap = new HashMap<>();
-                    resetmap.put(params.get("BLANKID").toString(), operationOutMaterDos);
+                    ResetProcessOperationVo resetmap = new ResetProcessOperationVo();
+                    resetmap.setBlankid(params.getBlankid());
+                    resetmap.setOutmeterinfo(operationOutMaterDos);
                     resetProcessOperation(resetmap);
                 }
             }
@@ -1608,8 +1610,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdate(apsProcessOperationOutMaterDo);
         if (bool1 && bool2) {
             if (operationOutMaterDos.size() > 0) {
-                Map<String, Object> resetmap = new HashMap<>();
-                resetmap.put(blanckdata.getStr("ID"), operationOutMaterDos);
+                ResetProcessOperationVo resetmap = new ResetProcessOperationVo();
+                resetmap.setBlankid(blanckdata.getStr("ID"));
+                resetmap.setOutmeterinfo(operationOutMaterDos);
                 resetProcessOperation(resetmap);
             }
             //更新坯料计划的所选工艺路线相关信息

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

@@ -0,0 +1,14 @@
+package com.rongwei.bsentity.vo;
+
+import com.rongwei.bsentity.domain.ApsProcessOperationOutMaterDo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ResetProcessOperationVo {
+    //坯料计划ID
+    private String blankid;
+    //修改得作业输出
+    private List<ApsProcessOperationOutMaterDo> outmeterinfo;
+}

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProcessOperationController.java

@@ -2,7 +2,7 @@ package com.rongwei.bsserver.controller;
 
 
 import com.rongwei.bscommon.sys.service.ApsProcessOperationService;
-import com.rongwei.bsentity.domain.ApsProcessOperationOutMaterDo;
+import com.rongwei.bsentity.vo.ResetProcessOperationVo;
 import com.rongwei.rwcommon.base.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,9 +95,9 @@ public class ApsProcessOperationController {
     更新后面所有工序信息
      */
     @PostMapping("/resetProcessOperation")
-    public R resetProcessOperation(@RequestBody Map<String, Object> params) {
+    public R resetProcessOperation(@RequestBody ResetProcessOperationVo params) {
         try {
-            log.info("更新后面所有工序信息;参数为：{}", params);
+            log.info("更新后面所有工序信息;参数为：{}", params.toString());
             return apsProcessOperationService.resetProcessOperation(params);
         } catch (Exception e) {
             e.printStackTrace();