抄码存入详情

2026-04-15 12:27:38 +08:00
parent f89c948da4
commit e5681bc510
7 changed files with 100 additions and 0 deletions
@@ -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;

 }
@@ -340,5 +340,21 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
    @ApiModelProperty("序列号")
    private List<InMaterialDetailSerialNumberPO> 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;
+

 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -83,6 +83,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="extAttr2"    column="EXT_ATTR_2"    />
        <result property="extAttr3"    column="EXT_ATTR_3"    />
        <result property="extAttr4"    column="EXT_ATTR_4"    />
+        <result property="palletNumber"    column="pallet_number"    />
+        <result property="copyBatch"    column="copy_batch"    />
+        <result property="copyQuantity"    column="copy_quantity"    />
+        <result property="copyDetails"    column="copy_details"    />
    </resultMap>


@@ -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,