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

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

@@ -19,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,
+        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,orderName,
         order_id, bom_id, bom_num, orderDeliveryTime, remark, create_user, update_user, produce_status
     </sql>
 
@@ -48,7 +48,7 @@
 
     <select id="getList" parameterType="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct" resultType="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct">
         select a.*,b.name,b.no as bomNo,b.specifications as specifications,b.model,b.brand,ifnull(c.planNum,0) as planNum,
-        b.parts_no partsNo,b.parts_alias partsAlias,b.bom_alias bomAlias,b.name bomName,b.meterial_id meterialId,l.furnace_batch_no furnaceBatchNo,
+        b.parts_no partsNo,b.parts_alias partsAlias,b.bom_alias bomAlias,b.name bomName,b.meterial_id meterialId,l.furnace_batch_no furnaceBatchNo,d.order_name orderName,
         (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime from imcs_o_order_product a
         left join imcs_b_bom b on a.bom_id = b.id
         left join (

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

@@ -76,10 +76,10 @@
             AND c.pdeliveryTime <![CDATA[ <= ]]> #{pdeliveryTimeEnd}
         </if>
         <if test="deliveryTimeStart != null  and deliveryTimeStart != '' ">
-            AND b.pdeliveryTime <![CDATA[ >= ]]> #{deliveryTimeStart}
+            AND b.delivery_time <![CDATA[ >= ]]> #{deliveryTimeStart}
         </if>
         <if test="deliveryTimeEnd != null  and deliveryTimeEnd != '' ">
-            AND b.pdeliveryTime <![CDATA[ <= ]]> #{deliveryTimeEnd}
+            AND b.delivery_time <![CDATA[ <= ]]> #{deliveryTimeEnd}
         </if>
 <!--        <if test="id != null ">-->
 <!--            and a.id = #{id}-->

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/BBomMapper.xml

@@ -28,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,create_user,update_time,update_user,parts_no,parts_alias,bom_alias,meterial_id,remark,batch_no,key_flag,important_flag,
+        id,create_time,create_user,update_time,update_user,parts_no,parts_alias,bom_alias,meterial_id,remark,batch_no,key_flag,important_flag,group_no,trayName,
         audit_status, parent_id, name, no, status, model, brand, specification, module_id,materialBrandName,productModuleName, version,org_id
     </sql>
 
@@ -38,11 +38,12 @@
         select
         <include refid="Base_Column_List"/>
         from (select b.*,m.trade_mark materialBrandName,mi.name productModuleName
-            ,bi.version,z.org_id
+        ,bi.version,z.org_id,t.name trayName
         from imcs_b_bom b LEFT JOIN imcs_m_meterial m on b.meterial_id = m.id
-            LEFT JOIN imcs_b_bom_version_info bi on b.id = bi.bom_id and bi.use_status = 1
-            LEFT JOIN imcs_m_module_info mi on b.product_module_id = mi.id
-            LEFT JOIN imcs_z_zone z on z.id = b.zone_id
+        LEFT JOIN imcs_b_bom_version_info bi on b.id = bi.bom_id and bi.use_status = 1
+        LEFT JOIN imcs_m_module_info mi on b.product_module_id = mi.id
+        LEFT JOIN imcs_z_zone z on z.id = b.zone_id
+        LEFT JOIN imcs_t_tray t on t.id = b.tray_id
         where 1=1
         ) s ${ew.customSqlSegment}
 

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

@@ -108,6 +108,7 @@ public class OrderController extends SuperController<OrderService, Long, Order,
                     wrapper.isNull(Order::getAuditStatus);
                 }
         wrapper.eq(Order::getSource,order.getSource())
+                .like(Order::getOrderName,order.getOrderName())
                 .in(Order::getPlanStatus,planStatus)
                 .geHeader(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_st())?null:LocalDateTime.parse(order.getDeliveryTime_st()))
                 .leFooter(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_ed())?null:LocalDateTime.parse(order.getDeliveryTime_ed()))

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

@@ -107,11 +107,11 @@ public class PlanController extends SuperController<PlanService, Long, Plan, Pla
         }
         String deliveryTimeStart = "";
         String deliveryTimeEnd = "";
-        if(plan.getDeliveryTimeStart() != null){
-            deliveryTimeStart = sdf.format(plan.getDeliveryTimeStart());
+        if(plan.getDeliveryTime_st() != null){
+            deliveryTimeStart = sdf.format(plan.getDeliveryTime_st());
         }
-        if(plan.getDeliveryTimeEnd() != null){
-            deliveryTimeEnd = sdf.format(plan.getDeliveryTimeEnd());
+        if(plan.getDeliveryTime_ed() != null){
+            deliveryTimeEnd = sdf.format(plan.getDeliveryTime_ed());
         }
         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/OrderPageDTO.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;
@@ -51,6 +53,13 @@ public class OrderPageDTO implements Serializable {
     @NotEmpty(message = "订单编号不能为空")
     @Length(max = 128, message = "订单编号长度不能超过128")
     private String orderNo;
+
+    @ApiModelProperty(value = "订单名称")
+    @NotEmpty(message = "订单名称不能为空")
+    @Length(max = 128, message = "订单名称长度不能超过128")
+    @Excel(name = "订单名称")
+    private String orderName;
+
     /**
      * 客户ID
      */

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

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.operationManagementCenter.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
@@ -24,6 +25,8 @@ import com.github.zuihou.common.constant.DictionaryType;
 import java.io.Serializable;
 import java.util.List;
 
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
 /**
  * <p>
  * 实体类
@@ -59,6 +62,12 @@ public class OrderSaveDTO implements Serializable {
     @NotNull(message = "客户ID不能为空")
     private Long custId;
 
+    @ApiModelProperty(value = "订单名称")
+    @NotEmpty(message = "订单名称不能为空")
+    @Length(max = 128, message = "订单名称长度不能超过128")
+    @Excel(name = "订单名称")
+    private String orderName;
+
     /**
      * 客户ID
      */

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

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.operationManagementCenter.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
@@ -56,6 +57,13 @@ public class OrderUpdateDTO implements Serializable {
     @NotEmpty(message = "订单编号不能为空")
     @Length(max = 128, message = "订单编号长度不能超过128")
     private String orderNo;
+
+    @ApiModelProperty(value = "订单名称")
+    @NotEmpty(message = "订单名称不能为空")
+    @Length(max = 128, message = "订单名称长度不能超过128")
+    @Excel(name = "订单名称")
+    private String orderName;
+
     /**
      * 客户ID
      */

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

@@ -146,10 +146,10 @@ public class PlanPageDTO implements Serializable {
     private String bomDesc;
 
     @ApiModelProperty(value = "计划开始时间")
-    private Date pdeliveryTimeStart;
+    private String pdeliveryTimeStart;
 
     @ApiModelProperty(value = "计划结束时间")
-    private Date pdeliveryTimeEnd;
+    private String pdeliveryTimeEnd;
 
 
     @ApiModelProperty(value = "计划开始时间")
@@ -162,4 +162,9 @@ public class PlanPageDTO implements Serializable {
     @TableField(exist = false)
     private String planIds;
 
+    @TableField(exist = false)
+    private String deliveryTime_st;
+    @TableField(exist = false)
+    private String deliveryTime_ed;
+
 }

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

@@ -74,6 +74,15 @@ public class OrderProduct extends Entity<Long> {
     @Excel(name = "订单编号")
     private String orderNo;
 
+    @ApiModelProperty(value = "订单编号")
+    @NotEmpty(message = "订单编号不能为空")
+    @Length(max = 128, message = "订单编号长度不能超过128")
+    @TableField(exist = false)
+    @Excel(name = "订单编号")
+    private String orderName;
+
+
+
     /**
      * bom_id
      */

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

@@ -312,13 +312,10 @@ public class Plan extends Entity<Long> {
     private Date pdeliveryTimeEnd;
 
 
-    @ApiModelProperty(value = "计划开始时间")
     @TableField(exist = false)
-    private Date deliveryTimeStart;
-
-    @ApiModelProperty(value = "计划结束时间")
+    private Date deliveryTime_st;
     @TableField(exist = false)
-    private Date deliveryTimeEnd;
+    private Date deliveryTime_ed;
 
     @ApiModelProperty(value = "订单明细ID")
     @TableField(exist = false)

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BBom.java

@@ -170,6 +170,11 @@ public class BBom extends Entity<Long> {
     @Excel(name = "托盘id")
     private Long trayId;
 
+    @ApiModelProperty(value = "托盘名称")
+    @TableField(exist = false)
+    @Excel(name = "托盘名称")
+    private String trayName;
+
     /**
      * 同步标志
      */