浏览代码

单卷模型转换需求调整

fangpy 1 年之前
父节点
当前提交
b0747f126a

+ 5 - 2
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -249,7 +249,7 @@ public class ApsServiceImpl implements ApsService {
                         equipment.setEquassociated(checkItemsD.getEquassociated());
                         // 设备参数
                         EquipmentParameter ep = new EquipmentParameter();
-                        ep.setEquipmentWidth(checkItemsD.getEquipmentwidth());
+                        ep.setEquipmentWidth(checkItemsD.getEquipmentlength());
                         ep.setEquipmentBearing(checkItemsD.getEquipmentbearing());
                         equipment.setEquipmentParameter(ep);
                         // 查询设备锁定的已排程的时间段
@@ -346,6 +346,9 @@ public class ApsServiceImpl implements ApsService {
      */
     private void processesRelationInit(ApsProcessOperationDo rootOperationDo,Map<String,List<ProductionProcesses>> operationProductionProcesses
             ,Map<String,ApsProcessOperationDo> operationMaps,ApsBlankOrderVo apsBlankOrderVo){
+        if(rootOperationDo.getId().equals("b4cf9ca488bb49268a9782ed1396c4f9")){
+            System.out.println(rootOperationDo);
+        }
         if(StringUtils.isNotBlank(rootOperationDo.getNextprocessid())){
             String[] nextids = rootOperationDo.getNextprocessid().split(",");
             // 前后道工序关联关系处理
@@ -382,7 +385,7 @@ public class ApsServiceImpl implements ApsService {
                                 }
                                 if(productionProcesses.get(i).getNextProcessesIds() == null){
                                     List<String> ids = new ArrayList<>();
-                                    ids.add(v.get(i).getId());
+                                    ids.add(v.get(vi).getId());
                                     productionProcesses.get(i).setNextProcessesIds(ids);
                                 }else{
                                     productionProcesses.get(i).getNextProcessesIds().add(v.get(i).getId());