添加产线字段

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

@@ -29,7 +29,7 @@ public interface TTaskMapper extends SuperMapper<TTask> {
     int getTaskCount(Map map);
     List<TTask> getTaskResource();
 
-    IPage<TTask> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<TTask> queryWrapper);
+    IPage<TTask> pageList(IPage page, @Param("mulPlanStatus")String mulPlanStatus, @Param(Constants.WRAPPER) Wrapper<TTask> queryWrapper);
 
     int updateTaskBegin();
 

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

@@ -49,7 +49,7 @@ public interface TaskService extends SuperService<TTask> {
      /**
       * 分页
       */
-     IPage<TTask> pageList(IPage page, LbqWrapper<TTask> wrapper);
+     IPage<TTask> pageList(IPage page,String mulPlanStatus, LbqWrapper<TTask> wrapper);
 
      /**
       * 排产调度数量统计

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

@@ -21,6 +21,7 @@ import com.github.zuihou.business.edgeLibrary.service.StockInfoService;
 import com.github.zuihou.business.edgeLibrary.service.StockLogService;
 import com.github.zuihou.business.edgeLibrary.service.StorgeService;
 import com.github.zuihou.business.operationManagementCenter.dao.OrderMapper;
+import com.github.zuihou.business.operationManagementCenter.dao.PlanMapper;
 import com.github.zuihou.business.operationManagementCenter.dao.TTaskMapper;
 import com.github.zuihou.business.operationManagementCenter.dao.WorkpieceMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.*;
@@ -109,6 +110,9 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     @Autowired
     private ParameterService parameterService;
 
+    @Autowired
+    private PlanMapper planMapper;
+
     @Override
     public List<TTask> createTaskByPlan(List<PlanProduct> planProductList, Map<Long,List<BomProcedure>> bomProcedureMap,String taskBatchNo) {
 
@@ -734,7 +738,18 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         getQueryMap(map);
         String planId = map.get("planId")==null?"":map.get("planId").toString();
         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));
+        String pArr[] = map.get("planIds")==null?null:planIds.split(",");
+
+        String mulPlanStatus = map.get("mulPlanStatus")==null?"":map.get("mulPlanStatus").toString();
+        //从排产调度来的，是通过查询计划
+        String mulPlanStatusArr[] = StringUtil.isEmpty(mulPlanStatus)?null:mulPlanStatus.split(",");
+        List<Long>planIdList = null;
+        if(mulPlanStatusArr!=null){
+            List<Plan>planList = planMapper.selectList(Wraps.<Plan>lbQ().in(Plan::getPlanStatus,mulPlanStatusArr));
+            planIdList = planList.stream().map(p -> p.getId()).collect(Collectors.toList());
+        }
+
+        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId).in(TTask::getPlanId,pArr).in(TTask::getPlanId,planIdList));
         List<String>dateStrList = new ArrayList<>();
         for(TTask t:taskList){
             String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM-dd");
@@ -919,8 +934,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     }
 
     @Override
-    public IPage<TTask> pageList(IPage page, LbqWrapper<TTask> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+    public IPage<TTask> pageList(IPage page,String mulPlanStatus, LbqWrapper<TTask> wrapper) {
+        return baseMapper.pageList(page, mulPlanStatus,wrapper);
     }
 
     @Override

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

@@ -122,6 +122,9 @@
             left join imcs_b_bom_procedure d on a.procedure_id = d.id
             left join imcs_tenant_productionresource f on a.resource_id = f.id
         where 1=1
+        <if test="mulPlanStatus != null and mulPlanStatus != ''">
+            and b.plan_status in(${mulPlanStatus})
+        </if>
         )
         s ${ew.customSqlSegment}
     </select>

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

@@ -38,6 +38,7 @@ import java.net.URLEncoder;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -69,19 +70,29 @@ public class PlanController extends SuperController<PlanService, Long, Plan, Pla
 
         //生成in的查询格式
         plan.setOrderProduceStatus(StringUtil.isEmpty(plan.getOrderProduceStatus())?"":StringUtil.changeIdsArrToSubQueryStr(plan.getOrderProduceStatus()));
+
+//        String planIds = plan.getPlanIds();
+//        String pArr[] = planIds.split(",");
         //构建查询参数
+
+
+        String mulPlanStatusArr[] = StringUtil.isEmpty(plan.getMulPlanStatus())?null:plan.getMulPlanStatus().split(",");
         wrapper.eq(Plan::getAuditStatus,plan.getAuditStatus())
                 /*.eq(Plan::getSource,plan.getSource())
                 .eq(Plan::getCustId,plan.getCustId())*/
                 .eq(Plan::getOrderId,plan.getOrderId())
                 .eq(Plan::getDraftFlag,plan.getDraftFlag())
                 .eq(Plan::getPlanStatus,plan.getPlanStatus())
+                .in(Plan::getPlanStatus,mulPlanStatusArr)
+//                .in(Plan::getId,pArr)
                 .eq(Plan::getId,plan.getId())
                 .orderByDesc(Plan::getCreateTime);
                 if(StringUtil.isNotEmpty(plan.getPlanIds())){
-                    wrapper.in(Plan::getId,plan.getPlanIds());
+                    String planIds = plan.getPlanIds();
+                    String pArr[] = planIds.split(",");
+                    wrapper.in(Plan::getId,pArr);
                 }
-//
+////
 
 
 

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

@@ -84,15 +84,14 @@ public class TaskController extends SuperController<TaskService, Long, TTask, TT
         LbqWrapper<TTask> wrapper = wrap.lambda();
         TTask task = BeanUtil.toBean(data, TTask.class);
 
-        String statusStr = task.getStatus()==null?"1,2":task.getStatus().toString();
-        List<String>statusList = Arrays.asList(statusStr.split(","));
-       wrapper.eq(TTask::getOrderId,task.getOrderId())
+        String statusArr[] = StringUtil.isEmpty(task.getStatus())?null:task.getStatus().split(",");
+        wrapper.eq(TTask::getOrderId,task.getOrderId())
                 .like(TTask::getTaskNo,task.getTaskNo())
                 .eq(TTask::getDraftFlag,"0")
                .eq(TTask::getResourceId,data.getResourceId())
-                .in(TTask::getStatus,statusList)
+                .in(TTask::getStatus,statusArr)
                 .orderByAsc(TTask::getExpectStartTime).orderByDesc(TTask::getPrority);
-        IPage<TTask> ipage = baseService.pageList(page, wrapper);
+        IPage<TTask> ipage = baseService.pageList(page,task.getMulPlanStatus(), wrapper);
         List<TTask> list = ipage.getRecords();
         //处理执行对象，目前和生产资源是一样，后续加入人工序再做处理
         for(TTask t:list){

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

@@ -1,6 +1,8 @@
 package com.github.zuihou.business.operationManagementCenter.dto;
 
 import java.time.LocalDateTime;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
@@ -100,6 +102,12 @@ public class PlanPageDTO implements Serializable {
     @ApiModelProperty(value = "生产状态(1-待生产2-生产中3-暂停4-已完成)")
     @Length(max = 16, message = "生产状态(1-待生产2-生产中3-暂停4-已完成)长度不能超过16")
     private String produceStatus;
+
+    @ApiModelProperty(value = "计划状态(1-未开始2-进行中3-完成)")
+    @Length(max = 16, message = "计划状态(1-未开始2-进行中3-完成)长度不能超过16")
+    @Excel(name = "计划状态(1-未开始2-进行中3-完成)")
+    private String mulPlanStatus;
+
     /**
      * 优先级
      */

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

@@ -1,6 +1,8 @@
 package com.github.zuihou.business.operationManagementCenter.dto;
 
 import java.time.LocalDateTime;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
@@ -77,6 +79,12 @@ public class TTaskPageDTO implements Serializable {
     @ApiModelProperty(value = "订单状态（1-已下发2-进行中3-已完成）")
     @Length(max = 4, message = "订单状态（1-已下发2-进行中3-已完成）长度不能超过4")
     private String status;
+
+
+    @ApiModelProperty(value = "计划状态(1-未开始2-进行中3-完成)")
+    @Length(max = 16, message = "计划状态(1-未开始2-进行中3-完成)长度不能超过16")
+    @Excel(name = "计划状态(1-未开始2-进行中3-完成)")
+    private String mulPlanStatus;
     /**
      * 预计开始时间
      */

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

@@ -110,6 +110,13 @@ public class Plan extends Entity<Long> {
     @Excel(name = "计划状态(1-未开始2-进行中3-完成)")
     private String planStatus;
 
+
+    @ApiModelProperty(value = "计划状态(1-未开始2-进行中3-完成)")
+    @Length(max = 16, message = "计划状态(1-未开始2-进行中3-完成)长度不能超过16")
+    @TableField(exist = false)
+    @Excel(name = "计划状态(1-未开始2-进行中3-完成)")
+    private String mulPlanStatus;
+
     /**
      * 开始时间
      */

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

@@ -249,6 +249,13 @@ public class TTask extends Entity<Long> {
     @Excel(name = "bom_id")
     private Long bomId;
 
+    @ApiModelProperty(value = "计划状态(1-未开始2-进行中3-完成)")
+    @Length(max = 16, message = "计划状态(1-未开始2-进行中3-完成)长度不能超过16")
+    @TableField(exist = false)
+    @Excel(name = "计划状态(1-未开始2-进行中3-完成)")
+    private String mulPlanStatus;
+
+
 
     /**
      * 任务批次号