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

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/entity/ReserveStockInOrder.java

@@ -408,5 +408,16 @@ public class ReserveStockInOrder extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date storageTime;
+    @ApiModelProperty("客户id")
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String customerCode;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String customerName;
 
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/po/ReserveStockInOrderPO.java

@@ -432,5 +432,16 @@ public class ReserveStockInOrderPO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date storageTime;
+    @ApiModelProperty("客户id")
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String customerCode;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String customerName;
 
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java

@@ -431,4 +431,15 @@ public class ReserveStockInOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date storageTime;
+    @ApiModelProperty("客户id")
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String customerCode;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String customerName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java

@@ -429,4 +429,15 @@ public class ReserveStockInOrderDTO extends ReserveStockInOrderBaseDTO {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date storageTime;
+    @ApiModelProperty("客户id")
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String customerCode;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String customerName;
 }

mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml

@@ -93,6 +93,9 @@
         <result property="directorName"    column="DIRECTOR_NAME"    />
         <result property="storageTime"    column="STORAGE_TIME"    />
         <result property="inQuantity"    column="IN_QUANTITY"    />
+        <result property="customerId"    column="CUSTOMER_ID"    />
+        <result property="customerName"    column="CUSTOMER_NAME"    />
+        <result property="customerCode"    column="CUSTOMER_CODE"    />
     </resultMap>
 
 
@@ -126,9 +129,9 @@
         a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER,
         a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO,
         a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
-        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.reserve_audit_time,a.reserve_audit_name
-        ,a.reserve_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE,a.tms_order_number
-        ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity
+        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.reservation_audit_time,a.reservation_audit_name
+        ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE,a.tms_order_number
+        ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity,a.customer_id,a.customer_name,a.customer_code
     </sql>
 
     <sql id="joinStockInOrderPo">

mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml

@@ -110,8 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.CONTACT_PERSON,a.VEHICLE_MODEL_PLATE,a.ENTRUST_NO,a.TEL,a.DRIVER_SIGN,a.FAX,a.DECLARE_CUSTOMS,a.MANUFACTURER,
         a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,
         a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
-        a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reserve_audit_time,a.reserve_audit_name
-        ,a.reserve_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
+        a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reservation_audit_time,a.reservation_audit_name
+        ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
         a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME
     </sql>