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

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.Gson;
 import com.rongwei.bscommon.sys.dao.*;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bscommon.sys.utils.ApsUtils;
@@ -3252,7 +3253,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     public void insertSchedule(Map<String, Object> params) {
         List<ApsBlankOrderVo> apsBlankOrders = apsBlankOrderDao.getByOrderBlanckId(params.get("PRODUCTIONORDERID").toString(), params.get("BLANKORDERID").toString());
         if (apsBlankOrders != null && apsBlankOrders.size() > 0) {
-            apsService.apsSchedule(apsBlankOrders, "cd", null);
+            apsService.apsSchedule(apsBlankOrders, new ApsTypeVo(), null);
         }
     }
 
@@ -3979,8 +3980,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             this.baseMapper.removeLockNextTwoDayProcessEqu(needScheduleDate);
             //获取排程类型
             ApsScheduleConfigDo apsScheduleConfigDo = apsScheduleConfigService.getById("1");
+            String scheduletype = apsScheduleConfigDo.getScheduletype();
+            ApsTypeVo apsTypeVo = BeanUtil.toBean(scheduletype, ApsTypeVo.class);
+            apsTypeVo.setMixIf("mix");
+            apsTypeVo.setThMergeMode("notThMergeBf");
+            apsTypeVo.setConstraintMode("lz");
             //重新排程
-            apsService.apsSchedule(new ArrayList<>(), apsScheduleConfigDo.getScheduletype(), null);
+            apsService.apsSchedule(new ArrayList<>(), apsTypeVo, null);
         }
     }
 }