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

2026-04-22 15:45:52 +08:00
parent 6cbbf1305c a47e5aafca
commit 7dd8e53927
6 changed files with 38 additions and 42 deletions
@@ -15,6 +15,15 @@ public class CopyCodeReferenceDTO extends BaseVOEntity {
    @ApiModelProperty("ID")
    private Long id;

+    @ApiModelProperty("组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    private Long topOrganizationId;
+
    @ApiModelProperty("货主ID")
    private Long shipperId;

@@ -125,6 +125,12 @@
          AND material_code = #{materialCode}
          AND batch_number = #{batchNumber}
          AND box_pallet_no = #{boxPalletNo}
+        <if test="topOrganizationId != null">
+            AND top_organization_id = #{topOrganizationId}
+        </if>
+        <if test="organizationId != null">
+            AND organization_id = #{organizationId}
+        </if>
        ORDER BY serial_number
    </select>