Merge remote-tracking branch 'origin/master' into master

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

@@ -504,16 +504,15 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
             return map;
         }
 
-        List<Map>list = new ArrayList<Map>();
-        if(map!=null&&map.get("orderList")!=null){
-            list = (List<Map>)map.get("orderList");
-        }
-
-        isFalse(list==null||list.size()==0,"排产订单不能为空");
+//        List<Map>list = new ArrayList<Map>();
+//        if(map!=null&&map.get("orderList")!=null){
+//            list = (List<Map>)map.get("orderList");
+//        }
+//
+//        isFalse(list==null||list.size()==0,"排产订单不能为空");
+        List<Plan>planList = planMapper.selectList(Wraps.<Plan>lbQ().in(Plan::getId,planIds));
         //更新订单状态
-        for(Map m:list){
-            Plan plan = new Plan();
-            plan.setId(Long.parseLong(m.get("id").toString()));
+        for(Plan plan:planList){
             plan.setPlanStatus("2");//进行中
             plan.setSchedulingStatus("1");//已排产
             plan.setProduceStatus("2");
@@ -773,7 +772,8 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
             Operation operation = it.next().getValue();
             for(TTask task : taskList){
                 if(task.getTmpId().equals(operation.getId())){
-                    List<BomProcedureProductionresource> procedureProductionresourceList = procedureProductionresourceMapper.selectList(Wraps.<BomProcedureProductionresource>lbQ().eq(BomProcedureProductionresource::getProcedureId,task.getProcedureId()).eq(BomProcedureProductionresource::getResourceId,operation.getMachineId()));
+                    List<BomProcedureProductionresource> procedureProductionresourceList = procedureProductionresourceMapper.selectList(Wraps.<BomProcedureProductionresource>lbQ().eq(BomProcedureProductionresource::getProcedureId,task.getProcedureId()).
+                            eq(BomProcedureProductionresource::getResourceId,operation.getMachineId()).orderByDesc(BomProcedureProductionresource::getCreateTime));
                     task.setExpectStartTime(new Date(operation.getStart()));
                     task.setExpectEndTime(new Date(operation.getFinish()));
                     task.setResourceId(operation.getMachineId());

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

@@ -600,7 +600,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         //参数放置位置处理
         getQueryMap(map);
         String planId = map.get("planId")==null?"":map.get("planId").toString();
-        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId));
+        String planIds = map.get("planIds")==null?"":map.get("planIds").toString();
+        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId).in(TTask::getPlanId,planIds));
         List<String>dateStrList = new ArrayList<>();
         for(TTask t:taskList){
             String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM");
@@ -627,6 +628,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         queryMap.put("taskBatchNo",taskBatchNo);
         queryMap.put("draftFlag",draftFlag);
         queryMap.put("planId",planId);
+        queryMap.put("planIds",planIds);
         List<Map> dataList = baseMapper.getTaskList(queryMap);
         int count = baseMapper.getTaskCount(queryMap);
         for(Map m:dataList){
@@ -657,7 +659,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         //参数放置位置处理
         getQueryMap(map);
         String planId = map.get("planId")==null?"":map.get("planId").toString();
-        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId));
+        String planIds = map.get("planIds")==null?"":map.get("planIds").toString();
+        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId).in(TTask::getPlanId,planIds));
         List<String>dateStrList = new ArrayList<>();
         for(TTask t:taskList){
             String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM-dd");
@@ -684,6 +687,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         queryMap.put("taskBatchNo",taskBatchNo);
         queryMap.put("draftFlag",draftFlag);
         queryMap.put("planId",planId);
+        queryMap.put("planIds",planIds);
         List<Map> dataList = baseMapper.getTaskList(queryMap);
         int count = baseMapper.getTaskCount(queryMap);
         for(Map m:dataList){
@@ -720,7 +724,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         //参数放置位置处理
         getQueryMap(map);
         String planId = map.get("planId")==null?"":map.get("planId").toString();
-        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId));
+        String planIds = map.get("planIds")==null?"":map.get("planIds").toString();
+        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId).in(TTask::getPlanId,planIds));
         List<String>dateStrList = new ArrayList<>();
         for(TTask t:taskList){
             String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM-dd");
@@ -750,6 +755,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         queryMap.put("taskBatchNo",taskBatchNo);
         queryMap.put("draftFlag",draftFlag);
         queryMap.put("planId",planId);
+        queryMap.put("planIds",planIds);
         List<Map> dataList = baseMapper.getTaskList(queryMap);
         Map<String,List<Map>>m = dataList.stream().filter(t->t.get("resourceCode")!=null).collect(Collectors.groupingBy(t->t.get("resourceCode").toString()));
         //根据设备编码找到名称

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

@@ -65,6 +65,9 @@
         <if test="planId != null and planId != ''">
             and plan_id = #{planId}
         </if>
+        <if test="planIds != null and planIds != ''">
+            and plan_id in (${planIds})
+        </if>
         <if test="draftFlag != null and draftFlag != ''">
             and draft_flag = #{draftFlag}
         </if>
@@ -85,6 +88,9 @@
         <if test="planId != null and planId != ''">
             and plan_id = #{planId}
         </if>
+        <if test="planIds != null and planIds != ''">
+            and plan_id in (${planIds})
+        </if>
         <if test="draftFlag != null and draftFlag != ''">
             and draft_flag = #{draftFlag}
         </if>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/PlanController.java

@@ -77,6 +77,11 @@ public class PlanController extends SuperController<PlanService, Long, Plan, Pla
                 .eq(Plan::getDraftFlag,plan.getDraftFlag())
                 .eq(Plan::getPlanStatus,plan.getPlanStatus())
                 .orderByDesc(Plan::getCreateTime);
+                if(StringUtil.isNotEmpty(plan.getPlanIds())){
+                    wrapper.in(Plan::getId,plan.getPlanIds());
+                }
+//
+
 
 
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/PlanPageDTO.java

@@ -150,4 +150,8 @@ public class PlanPageDTO implements Serializable {
     @ApiModelProperty(value = "计划结束时间")
     private Date deliveryTimeEnd;
 
+    @ApiModelProperty(value = "计划IDs")
+    @TableField(exist = false)
+    private String planIds;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/Plan.java

@@ -303,6 +303,12 @@ public class Plan extends Entity<Long> {
     private Long orderProductId;
 
 
+    @ApiModelProperty(value = "计划IDs")
+    @Length(max = 128, message = "计划IDs不能超过128")
+    @TableField(exist = false)
+    private String planIds;
+
+
 
     @Builder
     public Plan(Long id, LocalDateTime createTime, LocalDateTime updateTime,