姚云青 3 年 前
コミット
d6c2382dfe

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

@@ -674,10 +674,10 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         TTask task = new TTask();
         task.setDraftFlag("0");
         //更新任务
-        taskService.update(task,Wraps.<TTask>lbQ().in(TTask::getPlanId,planIds));
+        taskService.update(task,Wraps.<TTask>lbQ().in(TTask::getPlanId,planIds.split(",")));
 
         //把首任务放到mq中
-        List<TTask>taskList = taskService.list(Wraps.<TTask>lbQ().in(TTask::getPlanId,planIds));
+        List<TTask>taskList = taskService.list(Wraps.<TTask>lbQ().in(TTask::getPlanId,planIds.split(",")));
         //把一些重要信息存放缓存
         pushToRedis(taskList);
         pushToMq(taskList);

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

@@ -323,6 +323,9 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         for (String key : taskMap.keySet()) {
             int i = 1;
             for (TTask t : taskList) {
+                //taskList里面包含了所有的一次勾选的所有任务
+                if(!key.equals(t.getCompleteBatchNo()))
+                    continue;
 
                 //取出resrouceId
                 Long resourceBusinessId = t.getResourceBusinessId();

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/PlanMapper.xml

@@ -27,7 +27,7 @@
     <sql id="Base_Column_List">
         id,create_time,update_time,order_product_id,
         plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,bomId, partsNo,partsAlias,bomAlias,deliveryTime,pdeliveryTime,produceNum,
-        unqualifiedBomNum, prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,zoneId, org_id,workpieceIds
+        unqualifiedBomNum, prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,zoneId, org_id
     </sql>
 
     <!-- 分页 -->