工序作业卡片

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

@@ -37,7 +37,7 @@ public interface ApsProcessOperationService extends IService<ApsProcessOperation
     /*
     更新后面所有工序信息
      */
-    R resetProcessOperation(List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList);
+    R resetProcessOperation(Map<String, Object> params);
 
     R updateBorrowProcess(Map<String, Object> params);
 

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

@@ -1174,16 +1174,19 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
      */
     @Override
     @Transactional
-    public R resetProcessOperation(List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList) {
+    public R resetProcessOperation(Map<String, Object> params) {
         List<ApsProcessOperationOutMaterDo> operationOutMaterDos = new ArrayList<>();//递归的数据源
         try {
+            List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList = (List<ApsProcessOperationOutMaterDo>) params.get("OUTMETERINFO");
             // 获取排程参数设置
             List<ApsScheduleConfigDo> apsConfigs = apsScheduleConfigService.list();
             BigDecimal aluminumdensity = apsConfigs.get(0).getAluminumdensity();
-//            List<ApsProcessOperationDo> processOperationDos = apsProcessOperationDao.getProcessOperation(apsProcessOperationOutMaterDoList.get(0).getBlankid());
+
+            ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(params.get("BLANKID").toString());
+            String craftrouteid = apsBlankOrderDo.getCraftrouteid();
             //该坯料计划所有的工序及输出
             Map<String, Object> map = new HashMap<>();
-            map.put("BLANKID", apsProcessOperationOutMaterDoList.get(0).getBlankid());
+            map.put("BLANKID", params.get("BLANKID").toString());
             List<ApsProcessOperationDo> processOperationDoList = apsProcessOperationService.listByMap(map).stream().collect(Collectors.toList());
             List<ApsProcessOperationOutMaterDo> processOperationOutMaterDoList = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
 
@@ -1329,19 +1332,25 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             }
 
             //更新状态
-            CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();
-            req.setProcessOperationId(apsProcessOperationOutMaterDoList.get(0).getMainid());
-            apsProcessOperationProcessEquService.updateProductionStatus(req);
+            if (apsProcessOperationOutMaterDoList.size() > 0) {
+                CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();
+                req.setProcessOperationId(apsProcessOperationOutMaterDoList.get(0).getMainid());
+                apsProcessOperationProcessEquService.updateProductionStatus(req);
+            }
 
             if (bool1 && bool2) {
                 if (operationOutMaterDos.size() > 0) {
-                    resetProcessOperation(operationOutMaterDos);
+                    Map<String, Object> resetmap = new HashMap<>();
+                    resetmap.put(params.get("BLANKID").toString(), operationOutMaterDos);
+                    resetProcessOperation(resetmap);
                 }
-                return R.ok();
-            } else {
-                log.info("更新后面所有工序信息异常");
-                return R.error();
             }
+            //更新坯料计划的所选工艺路线相关信息
+            ApsCraftRouteDo apsCraftRouteDo = apsCraftRouteService.getById(craftrouteid);
+            R r = new R();
+            r.setCode("200");
+            r.setData(apsCraftRouteDo);
+            return r;
         } catch (Exception e) {
             e.printStackTrace();
             log.info("更新后面所有工序信息异常");
@@ -1599,7 +1608,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdate(apsProcessOperationOutMaterDo);
         if (bool1 && bool2) {
             if (operationOutMaterDos.size() > 0) {
-                resetProcessOperation(operationOutMaterDos);
+                Map<String, Object> resetmap = new HashMap<>();
+                resetmap.put(blanckdata.getStr("ID"), operationOutMaterDos);
+                resetProcessOperation(resetmap);
             }
             return R.ok();
         } else {

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

@@ -95,11 +95,10 @@ public class ApsProcessOperationController {
     更新后面所有工序信息
      */
     @PostMapping("/resetProcessOperation")
-    public R resetProcessOperation(@RequestBody List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList) {
+    public R resetProcessOperation(@RequestBody Map<String, Object> params) {
         try {
-            log.info("更新后面所有工序信息;参数为：{}", apsProcessOperationOutMaterDoList);
-            apsProcessOperationService.resetProcessOperation(apsProcessOperationOutMaterDoList);
-            return R.ok();
+            log.info("更新后面所有工序信息;参数为：{}", params);
+            return apsProcessOperationService.resetProcessOperation(params);
         } catch (Exception e) {
             e.printStackTrace();
             log.info("更新后面所有工序信息异常:" + e.getMessage());