From 87e3a837435b88c98e6dbb6465b40b922f92f29a Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Thu, 4 Jun 2026 17:20:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E5=85=B3=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockShelfOrderApplicationService.java | 1 + .../entity/CustomsDeclarationDetail.java | 12 ++++++++++++ .../repository/po/CustomsDeclarationDetailPO.java | 12 ++++++++++++ .../todo/CustomsDeclarationDetailDO.java | 15 +++++++++++++++ .../CustomsDeclarationDetailMapper.xml | 14 +++++++++++++- 5 files changed, 53 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index a21c83b10..9be2f9949 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/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()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/entity/CustomsDeclarationDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/entity/CustomsDeclarationDetail.java index 88eb27579..b2373e606 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/entity/CustomsDeclarationDetail.java +++ b/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; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/repository/po/CustomsDeclarationDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/repository/po/CustomsDeclarationDetailPO.java index 3a9dd17f6..9196326c1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/repository/po/CustomsDeclarationDetailPO.java +++ b/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; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/repository/todo/CustomsDeclarationDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/repository/todo/CustomsDeclarationDetailDO.java index 8c0565b42..7ce0afb37 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/customsDeclarationDetail/repository/todo/CustomsDeclarationDetailDO.java +++ b/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 organizationIdList; @ApiModelProperty(name = "单据编号集合") private List documentNumberList; + + @ApiModelProperty(name = "入库单号集合") + private List inOrderNumberList; } diff --git a/mhd_wms/src/main/resources/mapper/customsDeclarationDetail/CustomsDeclarationDetailMapper.xml b/mhd_wms/src/main/resources/mapper/customsDeclarationDetail/CustomsDeclarationDetailMapper.xml index eab67f23e..6d4e35534 100644 --- a/mhd_wms/src/main/resources/mapper/customsDeclarationDetail/CustomsDeclarationDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/customsDeclarationDetail/CustomsDeclarationDetailMapper.xml @@ -15,6 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -26,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -58,6 +61,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + + and in_order_number = #{inOrderNumber} + + + and in_order_number in + + #{item} + + and del_flag = #{delFlag} and del_flag = 1 From bb27fd4034023a7ff324b1a4016030085537665c Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Thu, 4 Jun 2026 17:22:20 +0800 Subject: [PATCH 2/2] sql --- sql/wms_update_20260414_zq.sql | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sql/wms_update_20260414_zq.sql b/sql/wms_update_20260414_zq.sql index 92144719f..98bd938ac 100644 --- a/sql/wms_update_20260414_zq.sql +++ b/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); \ No newline at end of file +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); \ No newline at end of file