计划

imcs-admin-boot/imcs-authority-server/src/main/java/com/github/zuihou/job/DashboardJob.java

@@ -113,7 +113,7 @@ public class DashboardJob {
             Page<Plan> planPage = new Page<Plan>();
             planPage.setSearchCount(false);
 
-            IPage<Plan> planData = planService.pageList(planPage, plan.getCustomDesc(),plan.getTaskBatchNo(),plan.getOrderProduceStatus(), wrapper);
+            IPage<Plan> planData = planService.pageList(planPage, plan.getBomDesc(), plan.getOrderName(),plan.getTaskBatchNo(),plan.getOrderProduceStatus(),null,null,null,null, wrapper);
             //planData = planData.getRecords().stream().map(obj -> obj.setEndTime() );
 
             Map planMap = Maps.newHashMap();

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

@@ -24,7 +24,9 @@ import java.util.Map;
 @Repository
 public interface PlanMapper extends SuperMapper<Plan> {
 
-    IPage<Plan> pageList(IPage page,@Param("customDesc")String customDesc,@Param("taskBatchNo")String taskBatchNo,@Param("orderProduceStatus")String orderProduceStatus, @Param(Constants.WRAPPER) Wrapper<Plan> queryWrapper);
+    IPage<Plan> pageList(IPage page,@Param("bomDesc")String bomDesc,@Param("orderName")String orderName,@Param("taskBatchNo")String taskBatchNo,@Param("orderProduceStatus")String orderProduceStatus,
+                         @Param("pdeliveryTimeStart")String pdeliveryTimeStart,@Param("pdeliveryTimeEnd")String pdeliveryTimeEnd,
+                         @Param("deliveryTimeStart")String deliveryTimeStart,@Param("deliveryTimeEnd")String deliveryTimeEnd,@Param(Constants.WRAPPER) Wrapper<Plan> queryWrapper);
 
     Map<String,String> getPlanStatusCount();
 

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

@@ -51,7 +51,7 @@ public interface PlanService extends SuperService<Plan> {
      /**
       * 分页
       */
-     IPage<Plan> pageList(IPage page,String customDesc,String taskBatchNo,String orderProduceStatus, LbqWrapper<Plan> wrapper);
+     IPage<Plan> pageList(IPage page,String bomDesc,String orderName,String taskBatchNo,String orderProduceStatus, String pdeliveryTimeStart,String pdeliveryTimeEnd,String deliveryTimeStart,String deliveryTimeEnd, LbqWrapper<Plan> wrapper);
 
      /**
       * 保存

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

@@ -229,8 +229,8 @@ public class PlanServiceImpl extends SuperServiceImpl<PlanMapper, Plan> implemen
     }
 
     @Override
-    public IPage<Plan> pageList(IPage page,String customDesc,String taskBatchNo,String orderProduceStatus, LbqWrapper<Plan> wrapper) {
-        return baseMapper.pageList(page,customDesc,taskBatchNo,orderProduceStatus, wrapper);
+    public IPage<Plan> pageList(IPage page,String bomDesc,String orderName,String taskBatchNo,String orderProduceStatus, String pdeliveryTimeStart,String pdeliveryTimeEnd,String deliveryTimeStart,String deliveryTimeEnd, LbqWrapper<Plan> wrapper) {
+        return baseMapper.pageList(page,bomDesc,orderName,taskBatchNo,orderProduceStatus, pdeliveryTimeStart,pdeliveryTimeEnd,deliveryTimeStart,deliveryTimeEnd,wrapper);
     }
 
     @Override

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

@@ -26,8 +26,8 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,update_time,
-        plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,partsNo,partsAlias,bomAlias,
-         prority, status,rhythm_type,orderNo,orderStatus,bomDesc,process,planBomNum,zoenDesc,completeNum,qualification
+        plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,partsNo,partsAlias,bomAlias,deliveryTime,pdeliveryTime,
+         prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,qualification
     </sql>
 
     <!-- 分页 -->
@@ -35,21 +35,21 @@
         select
         <include refid="Base_Column_List"/>
         from (
-            select a.*,b.order_no as orderNo,b.order_status as orderStatus,b.custDesc as customDesc,c.bomDesc,c.partsNo,c.partsAlias,c.bomAlias,
+        select a.*,b.order_no as orderNo,b.order_name orderName,b.source,b.order_status as orderStatus,c.bomDesc,c.partsNo,c.partsAlias,c.bomAlias,c.pdeliveryTime,b.delivery_time deliveryTime,
         CASE WHEN ifnull(v.completeCount ,0)=0 then 0 else round(100 *( v.verifyCount / v.completeCount),2) end qualification, ifnull(v.completeCount ,0) as completeNum,
         CASE WHEN ifnull(w.taskCount,0)=0 then 0 else  round(100 *( wcCount / taskCount),2) end process,ifnull(c.plan_bom_num,0) as planBomNum,d.name as zoenDesc from imcs_p_plan a
         left join (
-                select ord.*,cu.cust_name as custDesc from imcs_o_order ord
-                left join imcs_c_cust cu on ord.cust_id = cu.id
+        select ord.* from imcs_o_order ord
         )b on a.order_id = b.id
         left join (
-                select pp.*,bo.name as bomDesc,bo.parts_no partsNo,bo.parts_alias partsAlias,bo.bom_alias bomAlias from imcs_p_plan_product pp
-                left join imcs_b_bom bo on pp.bom_id = bo.id
-            ) c on a.id= c.plan_id
+        select pp.*,bo.name as bomDesc,bo.parts_no partsNo,bo.parts_alias partsAlias,bo.bom_alias bomAlias,op.delivery_time pdeliveryTime from imcs_p_plan_product pp
+        left join imcs_b_bom bo on pp.bom_id = bo.id
+        left join imcs_o_order_product op on pp.order_product_id = op.id
+        ) c on a.id= c.plan_id
         left join (
-                select pz.plan_id,GROUP_CONCAT(ze.name) name from imcs_p_plan_zone pz
-                left join imcs_z_zone ze on pz.zone_id = ze.id
-                GROUP BY pz.plan_id
+        select pz.plan_id,GROUP_CONCAT(ze.name) name from imcs_p_plan_zone pz
+        left join imcs_z_zone ze on pz.zone_id = ze.id
+        GROUP BY pz.plan_id
         ) d on a.id = d.plan_id
         LEFT JOIN ( SELECT t.plan_id, count(1) taskCount,  sum(CASE WHEN t. STATUS = '3' THEN 1 ELSE 0 END) wcCount FROM imcs_t_task t GROUP BY t.plan_id) w ON a.id = w.plan_id
         LEFT JOIN ( SELECT i.plan_id, count(1) completeCount, sum(CASE WHEN i. test_result = '1' THEN 1 ELSE 0 END) verifyCount FROM imcs_t_workpiece i GROUP BY i.plan_id ) v ON a.id = v.plan_id
@@ -60,8 +60,29 @@
         <if test="orderProduceStatus != null and orderProduceStatus != ''">
             and b.order_status in(${orderProduceStatus})
         </if>
-        <if test="customDesc != null and customDesc != ''">
-            and b.custDesc like concat('%', #{customDesc}, '%')
+        <if test="bomDesc != null and bomDesc != ''">
+            and c.bomDesc like concat('%', #{bomDesc}, '%')
+        </if>
+        <if test="orderName != null and orderName != ''">
+            and b.order_name like concat('%', #{orderName}, '%')
+        </if>
+        <if test="orderName != null and orderName != ''">
+            and b.order_name like concat('%', #{orderName}, '%')
+        </if>
+<!--        <if test="customDesc != null and customDesc != ''">-->
+<!--            and b.custDesc like concat('%', #{customDesc}, '%')-->
+<!--        </if>-->
+        <if test="pdeliveryTimeStart != null  and pdeliveryTimeStart != '' ">
+            AND c.pdeliveryTime <![CDATA[ >= ]]> #{pdeliveryTimeStart}
+        </if>
+        <if test="pdeliveryTimeEnd != null  and pdeliveryTimeEnd != '' ">
+            AND c.pdeliveryTime <![CDATA[ <= ]]> #{pdeliveryTimeEnd}
+        </if>
+        <if test="deliveryTimeStart != null  and deliveryTimeStart != '' ">
+            AND b.pdeliveryTime <![CDATA[ >= ]]> #{deliveryTimeStart}
+        </if>
+        <if test="deliveryTimeEnd != null  and deliveryTimeEnd != '' ">
+            AND b.pdeliveryTime <![CDATA[ <= ]]> #{deliveryTimeEnd}
         </if>
         ) s ${ew.customSqlSegment}
     </select>

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

@@ -37,6 +37,7 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -76,7 +77,26 @@ public class PlanController extends SuperController<PlanService, Long, Plan, Pla
                 .eq(Plan::getDraftFlag,plan.getDraftFlag())
                 .orderByDesc(Plan::getPrority)
                 .orderByDesc(Plan::getCreateTime);
-        baseService.pageList(page,plan.getCustomDesc(),plan.getTaskBatchNo(),plan.getOrderProduceStatus(),wrapper);
+
+
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String pdeliveryTimeStart = "";
+        String pdeliveryTimeEnd = "";
+        if(plan.getPdeliveryTimeStart() != null){
+            pdeliveryTimeStart = sdf.format(plan.getPdeliveryTimeStart());
+        }
+        if(plan.getPdeliveryTimeEnd() != null){
+            pdeliveryTimeEnd = sdf.format(plan.getPdeliveryTimeEnd());
+        }
+        String deliveryTimeStart = "";
+        String deliveryTimeEnd = "";
+        if(plan.getDeliveryTimeStart() != null){
+            deliveryTimeStart = sdf.format(plan.getDeliveryTimeStart());
+        }
+        if(plan.getDeliveryTimeEnd() != null){
+            deliveryTimeEnd = sdf.format(plan.getDeliveryTimeEnd());
+        }
+        baseService.pageList(page,plan.getBomDesc(),plan.getOrderName(),plan.getTaskBatchNo(),plan.getOrderProduceStatus(),pdeliveryTimeStart,pdeliveryTimeEnd,deliveryTimeStart,deliveryTimeEnd,wrapper);
 
     }
 

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

@@ -22,6 +22,7 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 import com.github.zuihou.common.constant.DictionaryType;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -130,4 +131,23 @@ public class PlanPageDTO implements Serializable {
     @TableField(exist = false)
     private String customDesc;
 
+    @ApiModelProperty(value = "订单名称")
+    private String orderName;
+
+    @ApiModelProperty(value = "产品")
+    private String bomDesc;
+
+    @ApiModelProperty(value = "计划开始时间")
+    private Date pdeliveryTimeStart;
+
+    @ApiModelProperty(value = "计划结束时间")
+    private Date pdeliveryTimeEnd;
+
+
+    @ApiModelProperty(value = "计划开始时间")
+    private Date deliveryTimeStart;
+
+    @ApiModelProperty(value = "计划结束时间")
+    private Date deliveryTimeEnd;
+
 }

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

@@ -215,6 +215,33 @@ public class Plan extends Entity<Long> {
     @TableField(exist = false)
     private String customDesc;
 
+
+    @ApiModelProperty(value = "订单名称")
+    @TableField(exist = false)
+    private String orderName;
+
+    @ApiModelProperty(value = "来源")
+    @TableField(exist = false)
+    private String source;
+
+
+    @ApiModelProperty(value = "交货时间")
+    @TableField(exist = false)
+    @Excel(name = "交货时间", format = DEFAULT_DATE_TIME_FORMAT, width = 20)
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deliveryTime;
+
+
+    @ApiModelProperty(value = "零件交货时间")
+    @TableField(exist = false)
+    @Excel(name = "零件交货时间", format = DEFAULT_DATE_TIME_FORMAT, width = 20)
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pdeliveryTime;
+
+
+
     /**
      * 计划生产状态(1-待生产2-生产中3-暂停4-已完成)
      */
@@ -253,6 +280,24 @@ public class Plan extends Entity<Long> {
     private String bomAlias;
 
 
+    @ApiModelProperty(value = "计划开始时间")
+    @TableField(exist = false)
+    private Date pdeliveryTimeStart;
+
+    @ApiModelProperty(value = "计划结束时间")
+    @TableField(exist = false)
+    private Date pdeliveryTimeEnd;
+
+
+    @ApiModelProperty(value = "计划开始时间")
+    @TableField(exist = false)
+    private Date deliveryTimeStart;
+
+    @ApiModelProperty(value = "计划结束时间")
+    @TableField(exist = false)
+    private Date deliveryTimeEnd;
+
+
 
     @Builder
     public Plan(Long id, LocalDateTime createTime, LocalDateTime updateTime,