From 6b28715eaffb4fdfc00738358df0c0b40b5a76a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 8 Apr 2026 14:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=8A=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8A=A0=E5=AD=97=E6=AE=B5;sql;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OutMaterialDetail.java | 41 +++++++++++ .../repository/po/OutMaterialDetailPO.java | 42 +++++++++++ .../repository/todo/OutMaterialDetailDO.java | 42 +++++++++++ .../stockOutOrder/entity/StockOutOrder.java | 22 ++++++ .../repository/po/StockOutOrderPO.java | 23 ++++++ .../repository/todo/StockOutOrderDO.java | 23 ++++++ .../OutMaterialDetailDTO.java | 40 +++++++++++ .../dto/stockOutOrder/StockOutOrderDTO.java | 22 ++++++ sql/wkx.sql | 70 ++++++++++++++++++- 9 files changed, 324 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java index 6ac5ebc1f..3c3a98179 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java @@ -452,4 +452,45 @@ public class OutMaterialDetail extends BaseVOEntity { @ApiModelProperty("是否已分配") @Excel(name = "是否已分配") private String isAllocated; + + + @ApiModelProperty("合同收费") + @Excel(name = "合同收费") + private BigDecimal contractFee; + + @ApiModelProperty("每月仓租") + @Excel(name = "每月仓租") + private BigDecimal monthlyWarehouseFee; + + @ApiModelProperty("半月仓租") + @Excel(name = "半月仓租") + private BigDecimal halfMonthWhFee; + + @ApiModelProperty("折扣(%)") + @Excel(name = "折扣(%)") + private BigDecimal discountRate; + + @ApiModelProperty("单体积(CBM)") + @Excel(name = "单体积(CBM)") + private BigDecimal singleVolume; + + @ApiModelProperty("单毛重(KG)") + @Excel(name = "单毛重(KG)") + private BigDecimal singleGrossWeight; + + @ApiModelProperty("lot编号") + @Excel(name = "lot编号") + private String lotNo; + + @ApiModelProperty("入库单号") + @Excel(name = "入库单号") + private String inOrderNumber; + + @ApiModelProperty("库存单位") + @Excel(name = "库存单位") + private String stockUnit; + + @ApiModelProperty("库存数量") + @Excel(name = "库存数量") + private BigDecimal stockQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java index 989a6b10e..0f9f139d6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java @@ -475,4 +475,46 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO { @ApiModelProperty("是否已分配") @Excel(name = "是否已分配") private String isAllocated; + + + + @ApiModelProperty("合同收费") + @Excel(name = "合同收费") + private BigDecimal contractFee; + + @ApiModelProperty("每月仓租") + @Excel(name = "每月仓租") + private BigDecimal monthlyWarehouseFee; + + @ApiModelProperty("半月仓租") + @Excel(name = "半月仓租") + private BigDecimal halfMonthWhFee; + + @ApiModelProperty("折扣(%)") + @Excel(name = "折扣(%)") + private BigDecimal discountRate; + + @ApiModelProperty("单体积(CBM)") + @Excel(name = "单体积(CBM)") + private BigDecimal singleVolume; + + @ApiModelProperty("单毛重(KG)") + @Excel(name = "单毛重(KG)") + private BigDecimal singleGrossWeight; + + @ApiModelProperty("lot编号") + @Excel(name = "lot编号") + private String lotNo; + + @ApiModelProperty("入库单号") + @Excel(name = "入库单号") + private String inOrderNumber; + + @ApiModelProperty("库存单位") + @Excel(name = "库存单位") + private String stockUnit; + + @ApiModelProperty("库存数量") + @Excel(name = "库存数量") + private BigDecimal stockQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java index e3adc68b9..4c6f6de90 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java @@ -430,4 +430,46 @@ public class OutMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("是否已分配") @Excel(name = "是否已分配") private String isAllocated; + + + + @ApiModelProperty("合同收费") + @Excel(name = "合同收费") + private BigDecimal contractFee; + + @ApiModelProperty("每月仓租") + @Excel(name = "每月仓租") + private BigDecimal monthlyWarehouseFee; + + @ApiModelProperty("半月仓租") + @Excel(name = "半月仓租") + private BigDecimal halfMonthWhFee; + + @ApiModelProperty("折扣(%)") + @Excel(name = "折扣(%)") + private BigDecimal discountRate; + + @ApiModelProperty("单体积(CBM)") + @Excel(name = "单体积(CBM)") + private BigDecimal singleVolume; + + @ApiModelProperty("单毛重(KG)") + @Excel(name = "单毛重(KG)") + private BigDecimal singleGrossWeight; + + @ApiModelProperty("lot编号") + @Excel(name = "lot编号") + private String lotNo; + + @ApiModelProperty("入库单号") + @Excel(name = "入库单号") + private String inOrderNumber; + + @ApiModelProperty("库存单位") + @Excel(name = "库存单位") + private String stockUnit; + + @ApiModelProperty("库存数量") + @Excel(name = "库存数量") + private BigDecimal stockQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java index a6329a461..86f293fd0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java @@ -369,4 +369,26 @@ public class StockOutOrder extends BaseVOEntity { @ApiModelProperty("app上传的图片") private String pictureApp; + @ApiModelProperty("业务单号") + @Excel(name = "业务单号") + private String businessOrderNo; + + @ApiModelProperty("业务类型") + @Excel(name = "业务类型") + private String businessType; + + @ApiModelProperty("制单人") + @Excel(name = "制单人") + private String documentCreator; + + @ApiModelProperty("制单人名称") + @Excel(name = "制单人名称") + private String documentCreatorName; + + @ApiModelProperty("制单日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date documentDate; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index ab73715ac..c6696f666 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -380,4 +380,27 @@ public class StockOutOrderPO extends BaseVOEntity { @ApiModelProperty("出库总数量") private BigDecimal totalOutboundQuantity; + + @ApiModelProperty("业务单号") + @Excel(name = "业务单号") + private String businessOrderNo; + + @ApiModelProperty("业务类型") + @Excel(name = "业务类型") + private String businessType; + + @ApiModelProperty("制单人") + @Excel(name = "制单人") + private String documentCreator; + + @ApiModelProperty("制单人名称") + @Excel(name = "制单人名称") + private String documentCreatorName; + + @ApiModelProperty("制单日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date documentDate; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index c5afac898..1130a64e6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -415,4 +415,27 @@ public class StockOutOrderDO extends BaseVOEntity { @ApiModelProperty(name = "已分配数量总数量") private BigDecimal alreadyAllocationQuantityAll; + + + @ApiModelProperty("业务单号") + @Excel(name = "业务单号") + private String businessOrderNo; + + @ApiModelProperty("业务类型") + @Excel(name = "业务类型") + private String businessType; + + @ApiModelProperty("制单人") + @Excel(name = "制单人") + private String documentCreator; + + @ApiModelProperty("制单人名称") + @Excel(name = "制单人名称") + private String documentCreatorName; + + @ApiModelProperty("制单日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date documentDate; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java index 448d3d71a..e428de001 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java @@ -422,4 +422,44 @@ public class OutMaterialDetailDTO extends BaseVOEntity { @ApiModelProperty("复核总面积(SQM)") @Excel(name = "复核总面积(SQM)") private BigDecimal checkArea; + + @ApiModelProperty("合同收费") + @Excel(name = "合同收费") + private BigDecimal contractFee; + + @ApiModelProperty("每月仓租") + @Excel(name = "每月仓租") + private BigDecimal monthlyWarehouseFee; + + @ApiModelProperty("半月仓租") + @Excel(name = "半月仓租") + private BigDecimal halfMonthWhFee; + + @ApiModelProperty("折扣(%)") + @Excel(name = "折扣(%)") + private BigDecimal discountRate; + + @ApiModelProperty("单体积(CBM)") + @Excel(name = "单体积(CBM)") + private BigDecimal singleVolume; + + @ApiModelProperty("单毛重(KG)") + @Excel(name = "单毛重(KG)") + private BigDecimal singleGrossWeight; + + @ApiModelProperty("lot编号") + @Excel(name = "lot编号") + private String lotNo; + + @ApiModelProperty("入库单号") + @Excel(name = "入库单号") + private String inOrderNumber; + + @ApiModelProperty("库存单位") + @Excel(name = "库存单位") + private String stockUnit; + + @ApiModelProperty("库存数量") + @Excel(name = "库存数量") + private BigDecimal stockQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index fe35ca819..127be73c6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -405,4 +405,26 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { @ApiModelProperty("出库交接图片，PDA出库交接时上传的照片，多张图片以逗号隔开") private String pictureApp; + + @ApiModelProperty("业务单号") + @Excel(name = "业务单号") + private String businessOrderNo; + + @ApiModelProperty("业务类型") + @Excel(name = "业务类型") + private String businessType; + + @ApiModelProperty("制单人") + @Excel(name = "制单人") + private String documentCreator; + + @ApiModelProperty("制单人名称") + @Excel(name = "制单人名称") + private String documentCreatorName; + + @ApiModelProperty("制单日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date documentDate; } \ No newline at end of file diff --git a/sql/wkx.sql b/sql/wkx.sql index 9d33b1e43..e118e8497 100644 --- a/sql/wkx.sql +++ b/sql/wkx.sql @@ -108,4 +108,72 @@ COMMENT ON COLUMN "NGWL_TEST_WMS"."SYS_TABLE_CONFIG"."ID" IS 'id'; -- ---------------------------- -- Primary Key structure for table SYS_TABLE_CONFIG -- ---------------------------- -ALTER TABLE "NGWL_TEST_WMS"."SYS_TABLE_CONFIG" ADD PRIMARY KEY ("ID"); \ No newline at end of file +ALTER TABLE "NGWL_TEST_WMS"."SYS_TABLE_CONFIG" ADD PRIMARY KEY ("ID"); + + + +ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "CARRIER_NAME" VARCHAR2(128); + +ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "BUSINESS_ORDER_NO" VARCHAR2(128); + +ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "BUSINESS_TYPE" VARCHAR2(128); + +ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "DOCUMENT_CREATOR" VARCHAR2(128); + +ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "DOCUMENT_CREATOR_NAME" VARCHAR2(200); + +ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "DOCUMENT_DATE" DATE; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_OUT_ORDER"."CARRIER_NAME" IS '承运商'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_OUT_ORDER"."BUSINESS_ORDER_NO" IS '业务单号'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_OUT_ORDER"."BUSINESS_TYPE" IS '业务类型'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_OUT_ORDER"."DOCUMENT_CREATOR" IS '制单人'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_OUT_ORDER"."DOCUMENT_CREATOR_NAME" IS '制单人名称'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_OUT_ORDER"."DOCUMENT_DATE" IS '制单日期'; + + + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "IN_ORDER_NUMBER" VARCHAR(32 CHAR) DEFAULT ''; + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "LOT_NO" VARCHAR2(200); + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "SINGLE_GROSS_WEIGHT" DECIMAL(10,4); + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "SINGLE_VOLUME" DECIMAL(10,4); + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "DISCOUNT_RATE" DECIMAL(10,2); + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "MONTHLY_WAREHOUSE_FEE" DECIMAL(10,4); + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "HALF_MONTH_WH_FEE" DECIMAL(10,4); + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "CONTRACT_FEE" DECIMAL(10,4); + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "STOCK_UNIT" VARCHAR2(100); + +ALTER TABLE "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL" ADD COLUMN "STOCK_QUANTITY" DECIMAL(10,4); + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."IN_ORDER_NUMBER" IS '入库单号'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."LOT_NO" IS 'LOT编号'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."SINGLE_GROSS_WEIGHT" IS '单件毛重 (KG)'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."SINGLE_VOLUME" IS '单件体积 (CBM)'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."DISCOUNT_RATE" IS '折扣 (%)'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."MONTHLY_WAREHOUSE_FEE" IS '每月仓租'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."HALF_MONTH_WH_FEE" IS '半月仓租'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."CONTRACT_FEE" IS '合同费用'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."STOCK_UNIT" IS '库存单位'; + +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."STOCK_QUANTITY" IS '库存件数' \ No newline at end of file