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

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

@@ -367,7 +367,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 long timestart = DateUtil.date().getTime();
 
                 while (a){
-                    int lastnum = planprocessrall;
+                    int lastnum = processOperationM.getPlanprocessrall();
 
                     // 首先看已合并生产的设备是否还有余量继续排产
                     for (ProductionProcesses processes : processesList) {
@@ -553,24 +553,25 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                         processesList.add(processes);
 
                                         lastnum = lastnum - haslast;
-                                        // 记录最后选用设备的顺序
-                                        m = i;
                                     }
                                 }
                             }
+                            // 记录最后选用设备的顺序
+                            m = i;
+                            System.out.println("******m = " + m);
                         }
                     }
-
+                    processOperationM.setPlanprocessrall(lastnum);
                     if(lastnum <= 0){
                         a = false;
                     }
 
                     // 循环超过2秒则强制退出防止内存溢出
-                    long timeend = DateUtil.date().getTime();
+                    /*long timeend = DateUtil.date().getTime();
                     if(timeend-timestart>3000){
                         System.out.println("数据异常强制退出，剩余待加工数量：" + lastnum);
                         a = false;
-                    }
+                    }*/
                 }
             }
         }

cx-aps/cx-aps-server/src/main/resources/bootstrap.yml

@@ -27,7 +27,7 @@ feign:
     config:
       default:
         connectTimeout: 5000
-        readTimeout: 60000
+        readTimeout: 1800000
   sentinel:
     enabled: true
 jwt: