Преглед на файлове

aps-排程参数增加字段:调度排程模式

sucheng преди 6 месеца
родител
ревизия
6093397986

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

@@ -960,7 +960,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
             //更新生产状态为“待发布”(20)
             List<ApsBlankOrderVo> toupstatus = apsBlankOrders.stream().filter(v ->
-                    blankids.contains(v.getId()) && (StringUtils.isBlank(v.getIfcp()) || "N".equals(v.getIfcp())))
+                            blankids.contains(v.getId()) && (StringUtils.isBlank(v.getIfcp()) || "N".equals(v.getIfcp())))
                     .collect(Collectors.toList());
             updateProductStatusByOrderIds(toupstatus);
             // 自动加锁坯料计划下的工序作业
@@ -3977,8 +3977,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             this.baseMapper.removeLockNextDayProcessEqu(needScheduleDate);
             //解锁后天开工的所有作业明细
             this.baseMapper.removeLockNextTwoDayProcessEqu(needScheduleDate);
+            //获取排程类型
+            ApsScheduleConfigDo apsScheduleConfigDo = apsScheduleConfigService.getById("1");
             //重新排程
-            apsService.apsSchedule(new ArrayList<>(), "mix", null);
+            apsService.apsSchedule(new ArrayList<>(), apsScheduleConfigDo.getScheduletype(), null);
         }
     }
 }

+ 5 - 0
cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsScheduleConfigDo.java

@@ -172,6 +172,11 @@ public class ApsScheduleConfigDo extends BaseDo {
      */
     @TableField("MIDWEIGHTDIFFERENCE")
     private BigDecimal midweightdifference;
+    /**
+     * 调度排程模式
+     */
+    @TableField("SCHEDULETYPE")
+    private String scheduletype;
 
 
 }