历史一键排产batchno逻辑废弃问题修改

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/PlanProductMapper.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface PlanProductMapper extends SuperMapper<PlanProduct> {
 
-    int updateByTaskBatchNo(@Param("taskBatchNo") String taskBatchNo);
+    int updateByTaskBatchNo(@Param("planIds") String planIds);
 
     int updateByPlanIds(@Param("planIds") String planIds);
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -628,7 +628,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
 //        }
 //
 //        isFalse(list==null||list.size()==0,"排产订单不能为空");
-        List<Plan>planList = planMapper.selectList(Wraps.<Plan>lbQ().in(Plan::getId,planIds));
+        List<Plan>planList = planMapper.selectList(Wraps.<Plan>lbQ().in(Plan::getId,planIds.split(",")));
         //更新订单状态
         for(Plan plan:planList){
             plan.setPlanStatus("2");//进行中

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -297,7 +297,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
     public void saveTaskNodeByTaskBatchNoNew(String taskBatchNo, SysUser sysUser) {
         //生成节点任务
 //        List<TTask> taskList = taskService.list(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo, taskBatchNo).orderByDesc(TTask::getPrority));
-        List<TTask> taskList = taskService.list(Wraps.<TTask>lbQ().in(TTask::getPlanId, taskBatchNo).orderByDesc(TTask::getPrority));
+        List<TTask> taskList = taskService.list(Wraps.<TTask>lbQ().in(TTask::getPlanId, taskBatchNo.split(",")).orderByDesc(TTask::getPrority));
 
         Map<String, List<TTask>> taskMap = taskList.stream().collect(groupingBy(TTask::getCompleteBatchNo));
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/util/DynamicRabbitMq.java

@@ -70,7 +70,7 @@ public class DynamicRabbitMq {
             container.setQueueNames(queueName);
             log.info("动态添加mq监听成功,交换机:{},路由key:{},队列:{}", DRIECT_EXCHANGE, routingKey, queueName);
         }
-        container.setPrefetchCount(1);
+        container.setPrefetchCount(100);
         container.setAcknowledgeMode(AcknowledgeMode.MANUAL);//消费者需手动确认
         container.setConsumersPerQueue(1);
         container.setMessageListener(consumerHandler);

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/PlanProductMapper.xml

@@ -25,7 +25,7 @@
 
     <update id="updateByTaskBatchNo">
       update imcs_p_plan_product set draft_flag = '0'
-      where plan_id in (select plan_id from imcs_t_task where task_batch_no =  #{taskBatchNo})
+      where plan_id in (${planIds})
     </update>
 
     <update id="updateByPlanIds">

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/UrlConfConstant.java

@@ -26,10 +26,10 @@ public interface UrlConfConstant {
         /**
          * 上位机模拟程序接口
          */
-        public String plcURL = "http://127.0.0.1:8764/task/testTask";
+//        public String plcURL = "http://127.0.0.1:8764/task/testTask";
 
 
-//        public String plcURL = "http://106.15.38.8:8090";
+        public String plcURL = "http://106.15.38.8:8090";
 
         /**
          * 保障平台