Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

2026-06-04 18:36:31 +08:00
parent 3c481bc569 f4b0149605
commit 661a17a44e
2 changed files with 5 additions and 0 deletions
@@ -235,6 +235,10 @@ public class PickingMaterialDetailPO extends BaseVOEntity {
    @Excel(name = "箱号/卡板号")
    private String boxPalletNo;

+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
    @ApiModelProperty("扩展字段1")
    @Excel(name = "扩展字段1")
    private String extAttr1;
@@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        a.COPY_CODE_REFERENCE_IDS,
        a.picked_copy_code_reference_ids,
        omd.in_order_number, omd.lot_no as lot_number,
+        omd.SPECIFICATION_MODEL,
        a.lot_No,a.in_order_number
    </sql>