APS二开服务业务数据转换模型数据

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -494,5 +494,18 @@ public class SaveConstans {
         MERGE_PRODUCE_PROCESS.add("");
     }
 
+    /**
+     * 加工方式
+     */
+    public static class ProcessWay {
+        /**
+         * 合并加工
+         */
+        public static final String PROCESS_WAY_MERGE = "合并加工";
+        /**
+         * 逐批加工
+         */
+        public static final String PROCESS_WAY_BATCH = "逐批加工";
+    }
 
 }

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

@@ -65,9 +65,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     ProductionProcesses processes = new ProductionProcesses();
                     // 工序所属订单
                     processes.setProduceOrder(Arrays.asList(new ProduceOrder[]{produceOrder}));
-                    // 判断是否合并生产工序
-                    String productprocess = operationDo.getProductprocess();
-                    if(SaveConstans.MERGE_PRODUCE_PROCESS.contains(productprocess)){
+                    // 判断是否合并生产工序,加工方式是“合并加工”
+                    String productprocess = operationDo.getProcessway();
+                    if(SaveConstans.ProcessWay.PROCESS_WAY_MERGE.equals(productprocess)){
                         // 合并生产工序
                         ApsProcessOperationVo processOperationVo = new ApsProcessOperationVo();
                         BeanUtil.copyProperties(operationDo,processOperationVo);
@@ -76,7 +76,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     }else {
                         // 非合并生产工序
                         List<String> optionalEquipments = new ArrayList<>();
-                        if(StringUtils.isNotBlank(operationDo.getCanchoosedevice())){
+                        if(StringUtils.isNotBlank(operationDo.getCanchoosedeviceid())){
                             String[] sbIds = operationDo.getCanchoosedeviceid().split(",");
                             for (String equIds : sbIds) {
                                 AspCheckItemsDo checkItemsD = aspCheckItemsService.getById(equIds);