weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库单及明细加字段;sql;

Browse Source
This commit is contained in:
王奎兴
2026-04-08 14:06:04 +08:00
parent add0621be0
commit 6b28715eaf
9 changed files with 324 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java
+41
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java
+42
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java
+42
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java
+22
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
+23
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
+23
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java
+40
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
+22
View File
@@ -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;
}
sql/wkx.sql
+69 -1
View File
@@ -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");
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 '库存件数'