楚江ERP-发货计划相关功能调整

@@ -33,6 +33,13 @@ public class ShipmentsPlanBo extends BaseBo<ShipmentsPlan> {
     private String workshopId;
     private String workshopId;
 
 
     /**
     /**
+     * 生产厂名称
+     */
+    @ApiModelProperty("生产厂名称")
+    private String workshopName;
+
+
+    /**
      * 状态
      * 状态
      */
      */
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")
@@ -53,6 +60,12 @@ public class ShipmentsPlanBo extends BaseBo<ShipmentsPlan> {
     private LocalDate afTomoPreShipDate;
     private LocalDate afTomoPreShipDate;
 
 
     /**
     /**
+     * 制单日期
+     */
+    @ApiModelProperty("制单日期")
+    private LocalDate createDate;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @ApiModelProperty("创建人ID")
     @ApiModelProperty("创建人ID")
@@ -94,6 +107,9 @@ public class ShipmentsPlanBo extends BaseBo<ShipmentsPlan> {
 
 
     @Override
     @Override
     protected void afterInit(ShipmentsPlan dto) {
     protected void afterInit(ShipmentsPlan dto) {
-
+        LocalDateTime time = dto.getCreateTime();
+        if (time != null) {
+            this.createDate = time.toLocalDate();
+        }
     }
     }
 }
 }

 package com.lframework.xingyun.sc.bo.shipments.plan;
 package com.lframework.xingyun.sc.bo.shipments.plan;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
@@ -48,6 +49,12 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private String orderNo;
     private String orderNo;
 
 
     /**
     /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    /**
      * 客户名称
      * 客户名称
      */
      */
     @ApiModelProperty("客户名称")
     @ApiModelProperty("客户名称")

@@ -53,6 +53,12 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String orderNo;
     private String orderNo;
 
 
     /**
     /**
+     * 客户ID
+     */
+    @TableField(exist = false)
+    private String customerId;
+
+    /**
      * 客户名称
      * 客户名称
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -7,6 +7,7 @@
         <result column="plan_id" property="planId"/>
         <result column="plan_id" property="planId"/>
         <result column="order_id" property="orderId"/>
         <result column="order_id" property="orderId"/>
         <result column="order_no" property="orderNo"/>
         <result column="order_no" property="orderNo"/>
+        <result column="customer_id" property="customerId"/>
         <result column="customer_name" property="customerName"/>
         <result column="customer_name" property="customerName"/>
         <result column="thickness" property="thickness"/>
         <result column="thickness" property="thickness"/>
         <result column="thickness_tol_pos" property="thicknessTolPos"/>
         <result column="thickness_tol_pos" property="thicknessTolPos"/>
@@ -35,6 +36,7 @@
             tb.plan_id,
             tb.plan_id,
             tb.order_id,
             tb.order_id,
             o.order_no,
             o.order_no,
+            o.ordering_unit AS customer_id,
             c.name AS customer_name,
             c.name AS customer_name,
             tb.order_spec_id,
             tb.order_spec_id,
             ol.thickness,
             ol.thickness,