工序类别

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

@@ -91,6 +91,7 @@ public class ApsServiceImpl implements ApsService {
      */
     @Override
     public void apsSchedule(List<ApsBlankOrderVo> apsBlankOrders,String apsType,SysUserVo currentUser) {
+        logger.info("**********排程请求开始**********");
         // 当前等路人所属工厂
         if(currentUser == null){
             currentUser = CXCommonUtils.getCurrentUser();
@@ -118,6 +119,7 @@ public class ApsServiceImpl implements ApsService {
                     idStrs = CollUtil.join(hasIds, "','");
                     idStrs = "'" + idStrs + "'";
                 }
+                logger.info("待排程订单："+idStrs);
                 // 查询存在未锁定的作业坯料计划
                 // 插单重排会优先排插单再排程其它的订单
                 if("cd".equals(apsType) && apsBlankOrders != null && apsBlankOrders.size()>0){
@@ -138,6 +140,8 @@ public class ApsServiceImpl implements ApsService {
                         apsBlankOrderVo.setIfcp("Y");
                     }
                     apsBlankOrders.addAll(fbNotLock);
+                    List<String> repcIds = fbNotLock.stream().map(v -> v.getId()).collect(Collectors.toList());
+                    logger.info("解锁重排订单："+repcIds);
                 }
                 apsOrderScheduleNew(apsBlankOrders,currentUser);
 //                apsOrderSchedule(apsBlankOrders,currentUser);

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/utils/CodeGeneration.java

@@ -55,7 +55,7 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("Irongwei@1");
-        dsc.setUrl("jdbc:mysql://192.168.0.201:3306/cx_dev?characterEncoding=utf8&failOverReadOnly=false&autoReconnect=true&roundRobinLoadBalance=true&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true&databaseTerm=SCHEMA");  //指定数据库
+        dsc.setUrl("jdbc:mysql://192.168.0.201:3306/cx_fpy?characterEncoding=utf8&failOverReadOnly=false&autoReconnect=true&roundRobinLoadBalance=true&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true&databaseTerm=SCHEMA");  //指定数据库
         autoGenerator.setDataSource(dsc);
 
         // 3、包的配置
@@ -83,7 +83,7 @@ public class CodeGeneration {
         strategy.setSuperEntityClass(BaseDo.class);
         strategy.setRestControllerStyle(true);
         // 设置要映射的表名（重要，需要修改的地方）
-        strategy.setInclude("aps_schedule_config");
+        strategy.setInclude("aps_process_operation_process_equ");
         strategy.setNaming(NamingStrategy.underline_to_camel); // 自动转换表名的驼峰命名法
         strategy.setColumnNaming(NamingStrategy.no_change); // 自动转换列名的驼峰命名法
         strategy.setEntityLombokModel(true); // 是否使用lombox