Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
This commit is contained in:
+4
@@ -357,17 +357,21 @@ public class ShelfMaterialDetail extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty("抄码托盘号")
|
||||
@Excel(name = "抄码托盘号")
|
||||
@TableField("pallet_number")
|
||||
private String palletNumber;
|
||||
|
||||
@ApiModelProperty("抄码批次号")
|
||||
@Excel(name = "抄码批次号")
|
||||
@TableField("copy_batch")
|
||||
private String copyBatch;
|
||||
|
||||
@ApiModelProperty("抄码数量")
|
||||
@Excel(name = "抄码数量")
|
||||
@TableField("copy_quantity")
|
||||
private String copyQuantity;
|
||||
|
||||
@ApiModelProperty("抄码数量克重详情")
|
||||
@Excel(name = "抄码数量克重详情")
|
||||
@TableField("copy_details")
|
||||
private String copyDetails;
|
||||
}
|
||||
+16
@@ -357,7 +357,23 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
|
||||
@Excel(name = "LOT编号")
|
||||
private String lotNumber;
|
||||
|
||||
@ApiModelProperty("抄码托盘号")
|
||||
@Excel(name = "抄码托盘号")
|
||||
private String palletNumber;
|
||||
|
||||
@ApiModelProperty("是否抄码: 1-是 2-否")
|
||||
@Excel(name = "是否抄码: 1-是 2-否")
|
||||
private Integer copyCode;
|
||||
|
||||
@ApiModelProperty("抄码批次号")
|
||||
@Excel(name = "抄码批次号")
|
||||
private String copyBatch;
|
||||
|
||||
@ApiModelProperty("抄码数量")
|
||||
@Excel(name = "抄码数量")
|
||||
private String copyQuantity;
|
||||
|
||||
@ApiModelProperty("抄码克重明细 JSON")
|
||||
@Excel(name = "抄码克重明细")
|
||||
private String copyDetails;
|
||||
}
|
||||
Reference in New Issue
Block a user