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

mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java

@@ -2729,6 +2729,7 @@ public class StockShelfOrderApplicationService {
                 detailDO.setDocumentNumber(stockShelfOrder.getShelfOrderNumber());
                 detailDO.setBondInvtNo(bondInvtNo);
                 detailDO.setInvtRow(invtRow);
+                detailDO.setInOrderNumber(stockShelfOrder.getInOrderNumber());
                 detailDO.setOrganizationId(stockShelfOrder.getOrganizationId());
                 detailDO.setOrganizationName(stockShelfOrder.getOrganizationName());
                 detailDO.setTopOrganizationId(stockShelfOrder.getTopOrganizationId());

mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/entity/CustomsDeclarationDetail.java

@@ -59,5 +59,17 @@ public class CustomsDeclarationDetail extends BaseVOEntity {
     @Excel(name = "行号")
     private Integer invtRow;
 
+    @ApiModelProperty("入库业务单号")
+    @Excel(name = "入库业务单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("出库单ID")
+    @Excel(name = "出库单ID")
+    private Long outOrderId;
+
+    @ApiModelProperty("出库业务单号")
+    @Excel(name = "出库业务单号")
+    private String outOrderNumber;
+
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/repository/po/CustomsDeclarationDetailPO.java

@@ -58,5 +58,17 @@ public class CustomsDeclarationDetailPO extends BaseVOEntity {
     @Excel(name = "行号")
     private Integer invtRow;
 
+    @ApiModelProperty("入库业务单号")
+    @Excel(name = "入库业务单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("出库单ID")
+    @Excel(name = "出库单ID")
+    private Long outOrderId;
+
+    @ApiModelProperty("出库业务单号")
+    @Excel(name = "出库业务单号")
+    private String outOrderNumber;
+
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/repository/todo/CustomsDeclarationDetailDO.java

@@ -58,9 +58,24 @@ public class CustomsDeclarationDetailDO extends BaseVOEntity {
     @Excel(name = "行号")
     private Integer invtRow;
 
+    @ApiModelProperty("入库业务单号")
+    @Excel(name = "入库业务单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("出库单ID")
+    @Excel(name = "出库单ID")
+    private Long outOrderId;
+
+    @ApiModelProperty("出库业务单号")
+    @Excel(name = "出库业务单号")
+    private String outOrderNumber;
+
     @ApiModelProperty(name = "组织ID集合")
     private List<Long> organizationIdList;
 
     @ApiModelProperty(name = "单据编号集合")
     private List<String> documentNumberList;
+
+    @ApiModelProperty(name = "入库单号集合")
+    private List<String> inOrderNumberList;
 }

mhd_wms/src/main/resources/mapper/customsDeclarationDetail/CustomsDeclarationDetailMapper.xml

@@ -15,6 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"    column="material_name"    />
         <result property="bondInvtNo"    column="bond_invt_no"    />
         <result property="invtRow"    column="invt_row"    />
+        <result property="inOrderNumber"    column="in_order_number"    />
+        <result property="outOrderId"    column="out_order_id"    />
+        <result property="outOrderNumber"    column="out_order_number"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="createByName"    column="create_by_name"    />
@@ -26,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectCustomsDeclarationDetailPo">
-        select id, organization_id, organization_name, top_organization_id, document_number, material_base_info_id, material_code, material_name, bond_invt_no, invt_row, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from customs_declaration_detail
+        select id, organization_id, organization_name, top_organization_id, document_number, material_base_info_id, material_code, material_name, bond_invt_no, invt_row, in_order_number, out_order_id, out_order_number, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from customs_declaration_detail
     </sql>
 
     <sql id="selectCustomsDeclarationDetailPo1">
@@ -58,6 +61,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="inOrderNumber != null and inOrderNumber != ''">
+            and in_order_number = #{inOrderNumber}
+        </if>
+        <if test="inOrderNumberList != null and inOrderNumberList.size > 0">
+            and in_order_number in
+            <foreach collection="inOrderNumberList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <choose>
             <when test="delFlag != null"> and del_flag = #{delFlag} </when>
             <otherwise> and del_flag = 1 </otherwise>

sql/wms_update_20260414_zq.sql

@@ -100,4 +100,20 @@ COMMENT ON TABLE customs_declaration_detail IS '报关明细表';
   COMMENT ON COLUMN customs_declaration_detail.del_flag IS '删除标志 1-正常 2-删除';
 
 CREATE INDEX idx_cdd_document_number ON customs_declaration_detail(document_number);
-CREATE INDEX idx_cdd_bond_invt_no ON customs_declaration_detail(bond_invt_no);
+CREATE INDEX idx_cdd_bond_invt_no ON customs_declaration_detail(bond_invt_no);
+
+
+
+
+ALTER TABLE NGWL_TEST_WMS.customs_declaration_detail ADD in_order_number VARCHAR(64);
+ALTER TABLE NGWL_TEST_WMS.customs_declaration_detail ADD out_order_id BIGINT;
+ALTER TABLE NGWL_TEST_WMS.customs_declaration_detail ADD out_order_number VARCHAR(64);
+
+
+COMMENT ON COLUMN NGWL_TEST_WMS.customs_declaration_detail.in_order_number IS '入库业务单号';
+COMMENT ON COLUMN NGWL_TEST_WMS.customs_declaration_detail.out_order_id IS '出库单ID';
+COMMENT ON COLUMN NGWL_TEST_WMS.customs_declaration_detail.out_order_number IS '出库业务单号';
+
+
+CREATE INDEX idx_cdd_in_order_number ON NGWL_TEST_WMS.customs_declaration_detail(in_order_number);
+CREATE INDEX idx_cdd_out_order_number ON NGWL_TEST_WMS.customs_declaration_detail(out_order_number);