清除工序作业

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

@@ -25,5 +25,5 @@ public interface ApsProcessOperationService extends IService<ApsProcessOperation
     /*
     清除工艺路线
      */
-    void clearCraftRoute(Map<String, Object> params, HttpServletRequest request);
+    void clearCraftRoute(Map<String, Object> params);
 }

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

@@ -17,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -94,6 +93,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             JSONObject blanckdata = new JSONObject(params.get("BLANKDATA"));
             String craftrouteid = params.get("CRAFTROUTEID").toString();
 
+            //先清空之前的相关数据
+            Map<String, Object> blanckMap = new HashMap<>();
+            blanckMap.put("BLANKID", blanckdata.getStr("ID"));
+            clearCraftRoute(blanckMap);
 
             //工艺路线对应的步骤信息
             Map<String, Object> map = new HashMap<>();
@@ -154,6 +157,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             map.put("CRAFTSTEPID", apsCraftRouteStepDo1.getId());
                             List<ApsCraftRouteOutMaterRequestDo> apsCraftRouteOutMaterRequestDo = apsCraftRouteOutMaterRequestService.listByMap(map).stream().collect(Collectors.toList());
                             ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo = BeanUtil.toBean(apsCraftRouteOutMaterRequestDo.get(0), ApsProcessOperationOutMaterDo.class);
+                            apsProcessOperationOutMaterDo.setId(SecurityUtil.getUUID());
                             if (StringUtils.isBlank(apsProcessOperationOutMaterDo.getProducttypeid())) {
                                 apsProcessOperationOutMaterDo.setProducttypeid(blanckdata.getStr("PRODUCTTYPEID"));
                             }
@@ -215,6 +219,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         map.put("CRAFTSTEPID", apsCraftRouteStepDo.getId());
                         List<ApsCraftRouteOutMaterRequestDo> apsCraftRouteOutMaterRequestDo = apsCraftRouteOutMaterRequestService.listByMap(map).stream().collect(Collectors.toList());
                         ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo = BeanUtil.toBean(apsCraftRouteOutMaterRequestDo.get(0), ApsProcessOperationOutMaterDo.class);
+                        apsProcessOperationOutMaterDo.setId(SecurityUtil.getUUID());
                         if (StringUtils.isBlank(apsProcessOperationOutMaterDo.getProducttypeid())) {
                             apsProcessOperationOutMaterDo.setProducttypeid(blanckdata.getStr("PRODUCTTYPEID"));
                         }
@@ -270,7 +275,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     清除工艺路线
      */
     @Override
-    public void clearCraftRoute(Map<String, Object> params, HttpServletRequest request) {
+    public void clearCraftRoute(Map<String, Object> params) {
         String blankid = params.get("BLANKID").toString();
         //工序作业
         apsProcessOperationDao.updateProcessOperation(blankid);

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

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -49,10 +48,10 @@ public class ApsProcessOperationController {
     清除工艺路线
      */
     @PostMapping("/clearCraftRoute")
-    public void clearCraftRoute(@RequestBody Map<String, Object> params, HttpServletRequest request) {
+    public void clearCraftRoute(@RequestBody Map<String, Object> params) {
         try {
             log.info("清除工艺路线;参数为：{}", params);
-            apsProcessOperationService.clearCraftRoute(params, request);
+            apsProcessOperationService.clearCraftRoute(params);
         } catch (Exception e) {
             e.printStackTrace();
             log.info("清除工艺路线异常:" + e.getMessage());