From e5681bc51080a52e5c2cb9fea650e805b35a2564 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Wed, 15 Apr 2026 12:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=84=E7=A0=81=E5=AD=98=E5=85=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ReceiptMaterialDetail.java | 15 +++++++++++++++ .../repository/po/ReceiptMaterialDetailPO.java | 16 ++++++++++++++++ .../repository/todo/ReceiptMaterialDetailDO.java | 16 ++++++++++++++++ .../entity/ShelfMaterialDetail.java | 16 ++++++++++++++++ .../repository/todo/ShelfMaterialDetailDO.java | 16 ++++++++++++++++ .../ReceiptMaterialDetailDTO.java | 16 ++++++++++++++++ .../ReceiptMaterialDetailMapper.xml | 5 +++++ 7 files changed, 100 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java index 1b8df3e16..c702c4493 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java @@ -350,5 +350,20 @@ public class ReceiptMaterialDetail extends BaseVOEntity { @TableField(exist = false) private BigDecimal pieceCount; + @ApiModelProperty("抄码托盘号") + @Excel(name = "抄码托盘号") + private String palletNumber; + + @ApiModelProperty("抄码批次号") + @Excel(name = "抄码批次号") + private String copyBatch; + + @ApiModelProperty("抄码数量") + @Excel(name = "抄码数量") + private String copyQuantity; + + @ApiModelProperty("抄码数量克重详情") + @Excel(name = "抄码数量克重详情") + private String copyDetails; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java index f0bef87b2..9d692181b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java @@ -340,5 +340,21 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity { @ApiModelProperty("序列号") private List materialDetailSerialNumberList; + @ApiModelProperty("抄码托盘号") + @Excel(name = "抄码托盘号") + private String palletNumber; + + @ApiModelProperty("抄码批次号") + @Excel(name = "抄码批次号") + private String copyBatch; + + @ApiModelProperty("抄码数量") + @Excel(name = "抄码数量") + private String copyQuantity; + + @ApiModelProperty("抄码数量克重详情") + @Excel(name = "抄码数量克重详情") + private String copyDetails; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java index 2befb89b2..96243e151 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java @@ -335,4 +335,20 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("复合条件查询 物料名称 物料编码 物料条码") private String compoundOrQuery; + + @ApiModelProperty("抄码托盘号") + @Excel(name = "抄码托盘号") + private String palletNumber; + + @ApiModelProperty("抄码批次号") + @Excel(name = "抄码批次号") + private String copyBatch; + + @ApiModelProperty("抄码数量") + @Excel(name = "抄码数量") + private String copyQuantity; + + @ApiModelProperty("抄码数量克重详情") + @Excel(name = "抄码数量克重详情") + private String copyDetails; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java index d1dbdbc6c..80174ebc6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java @@ -354,4 +354,20 @@ public class ShelfMaterialDetail extends BaseVOEntity { @ApiModelProperty("累计已上架面积(SQM)，与 totalArea 同口径累加本次面积") @TableField("total_area") private BigDecimal alreadyShelvesArea; + + @ApiModelProperty("抄码托盘号") + @Excel(name = "抄码托盘号") + private String palletNumber; + + @ApiModelProperty("抄码批次号") + @Excel(name = "抄码批次号") + private String copyBatch; + + @ApiModelProperty("抄码数量") + @Excel(name = "抄码数量") + private String copyQuantity; + + @ApiModelProperty("抄码数量克重详情") + @Excel(name = "抄码数量克重详情") + private String copyDetails; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java index 63f581a6f..7cfa19a7d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java @@ -340,4 +340,20 @@ public class ShelfMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("总面积(SQM)") @Excel(name = "总面积(SQM)") private BigDecimal totalArea; + + @ApiModelProperty("抄码托盘号") + @Excel(name = "抄码托盘号") + private String palletNumber; + + @ApiModelProperty("抄码批次号") + @Excel(name = "抄码批次号") + private String copyBatch; + + @ApiModelProperty("抄码数量") + @Excel(name = "抄码数量") + private String copyQuantity; + + @ApiModelProperty("抄码数量克重详情") + @Excel(name = "抄码数量克重详情") + private String copyDetails; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java index 0870a1efe..a42c4b10c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java @@ -284,4 +284,20 @@ public class ReceiptMaterialDetailDTO extends BaseVOEntity { @ApiModelProperty("单位") @Excel(name = "单位") private String unit; + + @ApiModelProperty("抄码托盘号") + @Excel(name = "抄码托盘号") + private String palletNumber; + + @ApiModelProperty("抄码批次号") + @Excel(name = "抄码批次号") + private String copyBatch; + + @ApiModelProperty("抄码数量") + @Excel(name = "抄码数量") + private String copyQuantity; + + @ApiModelProperty("抄码数量克重详情") + @Excel(name = "抄码数量克重详情") + private String copyDetails; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml index c442a0f76..ae031fc62 100644 --- a/mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml @@ -83,6 +83,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -94,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" c.SPECIFICATION_MODEL, a.DIMENSIONS DIMENSIONS, a.QUANTITY, a.ALREADY_RECEIPT_QUANTITY, a.ALREADY_RECEIPT_GROSS_WEIGHT, a.ALREADY_RECEIPT_NET_WEIGHT, a.ALREADY_RECEIPT_VOLUME, a.ALREADY_RECEIPT_AREA, a.RECEIPT_QUANTITY, a.RECEIPT_STATUS, a.PACK_ID, a.PACK_CODE, a.PACK_NAME, a.PACK_DETAIL_ID, ifnull(a.UNIT_CODE, b.UNIT_CODE) UNIT_CODE, ifnull(a.UNIT_NAME, b.UNIT_NAME) UNIT_NAME, a.UNIT_NUMBER, a.MATERIAL_WAREHOUSE_CONTROL_ID, a.SERIAL_NUMBER_MANAGE, a.QUALITY_INSPECTION_MANAGE, a.QUALITY_INSPECTION_STAGE, a.QUALITY_INSPECTION_RULE, a.QUALITY_INSPECTION_RATIO, a.QUALITY_INSPECTION_TERM, a.QUALITY_INSPECTION_RESULTS, a.ALLOW_OVERCHARGE, a.OVERCHARGE_RATIO, a.BATCH_NUMBER, ifnull(a.LOT_NO, b.LOT_NO) LOT_NO, a.MATERIAL_STATUS_CODE, a.MATERIAL_STATUS_NAME, a.DISTRIBUTE_RULE_ID, a.DISTRIBUTE_RULE_CODE, a.DISTRIBUTE_RULE_NAME, a.CONTAINER_ID, a.CONTAINER_CODE, a.CONTAINER_TYPE, a.CONTAINER_TYPE_NAME, a.LEVEL, a.PARENT_UNIQUE_ID, a.IN_UNIQUE_ID, a.ALLOW_MODIFY, a.REMARK, a.CREATE_TIME, a.CREATE_BY, a.CREATE_BY_NAME, a.UPDATE_TIME, a.UPDATE_BY, a.UPDATE_BY_NAME, a.GEN_STOCK_SHELF, a.DEL_FLAG, + a.pallet_number,a.copy_batch,a.copy_quantity,a.copy_details, ifnull(a.TOTAL_NET_WEIGHT, b.TOTAL_NET_WEIGHT) TOTAL_NET_WEIGHT, ifnull(a.TOTAL_GROSS_WEIGHT, b.TOTAL_GROSS_WEIGHT) TOTAL_GROSS_WEIGHT, ifnull(a.TOTAL_VOLUME, b.TOTAL_VOLUME) TOTAL_VOLUME,