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

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

@@ -86,8 +86,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     apsProcessOperationProcessEqu.setProcessid(process.getId());
                     apsProcessOperationProcessEqu.setProcessdeviceid(process.getEquipment().getId());
                     apsProcessOperationProcessEqu.setProcessdevice(process.getEquipment().getEquipmentName());
-                    apsProcessOperationProcessEqu.setProcessworkshopid(process.getEquipment().getWorkshop());
+                    apsProcessOperationProcessEqu.setProcessworkshopid(process.getEquipment().getWorkshopid());
                     apsProcessOperationProcessEqu.setProcessworkshop(process.getEquipment().getWorkshopname());
+                    apsProcessOperationProcessEqu.setTenantid(process.getEquipment().getFactoryid());
                     apsProcessOperationProcessEqu.setPlanstartdate(Date.from(process.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
                     apsProcessOperationProcessEqu.setPlanenddate(Date.from(process.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
                     apsProcessOperationProcessEqu.setPlanprocessrall(process.getProducePcNum());
@@ -113,8 +114,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         apsProcessOperationProcessEqu.setProcessid(k);
                         apsProcessOperationProcessEqu.setProcessdeviceid(process.getEquipment().getId());
                         apsProcessOperationProcessEqu.setProcessdevice(process.getEquipment().getEquipmentName());
-                        apsProcessOperationProcessEqu.setProcessworkshopid(process.getEquipment().getWorkshop());
-                        apsProcessOperationProcessEqu.setProcessworkshop(process.getEquipment().getWorkshopname());
                         apsProcessOperationProcessEqu.setPlanstartdate(Date.from(process.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
                         apsProcessOperationProcessEqu.setPlanenddate(Date.from(process.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
                         apsProcessOperationProcessEqu.setPlanprocessrall(v.size());
@@ -190,6 +189,25 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     processes.setProduceOrder(Arrays.asList(new ProduceOrder[]{produceOrder}));
                     // 判断是否合并生产工序,加工方式是“合并加工”
                     String productprocess = operationDo.getProcessway();
+                    // 设备列表
+                    List<String> optionalEquipments = new ArrayList<>();
+                    if(StringUtils.isNotBlank(operationDo.getCanchoosedeviceid())){
+                        String[] sbIds = operationDo.getCanchoosedeviceid().split(",");
+                        for (String equIds : sbIds) {
+                            AspCheckItemsDo checkItemsD = eqMaps.get(equIds);
+                            Equipment equipment = new Equipment();
+                            equipment.setBsEquipmentId(equIds);
+                            equipment.setId(equIds);
+                            equipment.setEquipmentName(checkItemsD.getCheckitemname());
+                            equipment.setWorkshopid(checkItemsD.getUsedeptid());
+                            equipment.setWorkshopname(checkItemsD.getUsedeptname());
+                            equipment.setFactoryid(checkItemsD.getTenantid());
+                            equipment.setFactory(checkItemsD.getOwnedfactory());
+                            optionalEquipments.add(equIds);
+                            equipmentList.add(equipment);
+                        }
+                    }
+
                     if(SaveConstans.ProcessWay.PROCESS_WAY_MERGE.equals(productprocess)){
                         // 合并生产工序
                         ApsProcessOperationVo processOperationVo = new ApsProcessOperationVo();
@@ -200,23 +218,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         processOperationMs.add(processOperationVo);
                     }else {
                         // 非合并生产工序
-                        List<String> optionalEquipments = new ArrayList<>();
-                        if(StringUtils.isNotBlank(operationDo.getCanchoosedeviceid())){
-                            String[] sbIds = operationDo.getCanchoosedeviceid().split(",");
-                            for (String equIds : sbIds) {
-                                AspCheckItemsDo checkItemsD = eqMaps.get(equIds);
-                                Equipment equipment = new Equipment();
-                                equipment.setBsEquipmentId(equIds);
-                                equipment.setId(equIds);
-                                equipment.setEquipmentName(checkItemsD.getCheckitemname());
-                                equipment.setWorkshopid(checkItemsD.getUsedeptid());
-                                equipment.setWorkshopname(checkItemsD.getUsedeptname());
-                                equipment.setFactoryid(checkItemsD.getTenantid());
-                                equipment.setFactory(checkItemsD.getOwnedfactory());
-                                optionalEquipments.add(equIds);
-                                equipmentList.add(equipment);
-                            }
-                        }
 
                         // 模型ID
                         processes.setId(operationDo.getId());

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

@@ -50,11 +50,6 @@ public class Equipment{
      */
     private String workshopid;
 
-    /**
-     * 设备所属车间
-     */
-    private String workshop;
-
     /**
      * 设备所属车间
      */