zhouz/huachuang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 避免可用库存关联重复

Browse Source
This commit is contained in:
zhouz
2026-07-22 14:47:46 +08:00
parent 2e87bf70aa
commit 7105731d9d
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/vo/ExpandAvailableInventoryReqVO.java
View File

@@ -1,7 +1,9 @@
package cn.code.nl.module.wms.controller.admin.iostorinv.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Size;
import lombok.Data;
import java.util.List;
@@ -16,6 +18,7 @@ public class ExpandAvailableInventoryReqVO {
@Schema(description = "箱号列表", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "箱号列表不能为空")
private List<String> vehicleCodes;
@Size(max = 500, message = "箱号数量不能超过 500 个")
private List<@NotBlank(message = "箱号不能为空") String> vehicleCodes;
}

16
nl-module-wms/nl-module-wms-server/src/main/resources/mapper/iostorinvdtl/IostorinvDtlMapper.xml
View File

@@ -23,13 +23,17 @@
resultType="cn.code.nl.module.wms.controller.admin.iostorinv.vo.AvailableInventoryRespVO">
SELECT <include refid="availableInventoryColumns"/>
FROM wms_group_plate gp
INNER JOIN wms_structattr sa ON sa.storagevehicle_code = gp.vehicle_code
INNER JOIN (
SELECT stor_id, storagevehicle_code, MAX(stor_code) AS stor_code, MAX(stor_name) AS stor_name
FROM wms_structattr
WHERE deleted = 0
GROUP BY stor_id, storagevehicle_code
) sa ON sa.storagevehicle_code = gp.vehicle_code
LEFT JOIN base_materialbase mb ON mb.material_id = gp.material_id AND mb.deleted = 0
WHERE sa.stor_id = #{reqVO.storId}
AND gp.status = '可用'
AND gp.qty - gp.frozen_qty &gt; 0
AND gp.deleted = 0
AND sa.deleted = 0
<if test="reqVO.materialCode != null and reqVO.materialCode != ''">
AND gp.material_code LIKE CONCAT('%', #{reqVO.materialCode}, '%')
</if>
@@ -46,13 +50,17 @@
resultType="cn.code.nl.module.wms.controller.admin.iostorinv.vo.AvailableInventoryRespVO">
SELECT <include refid="availableInventoryColumns"/>
FROM wms_group_plate gp
INNER JOIN wms_structattr sa ON sa.storagevehicle_code = gp.vehicle_code
INNER JOIN (
SELECT stor_id, storagevehicle_code, MAX(stor_code) AS stor_code, MAX(stor_name) AS stor_name
FROM wms_structattr
WHERE deleted = 0
GROUP BY stor_id, storagevehicle_code
) sa ON sa.storagevehicle_code = gp.vehicle_code
LEFT JOIN base_materialbase mb ON mb.material_id = gp.material_id AND mb.deleted = 0
WHERE sa.stor_id = #{storId}
AND gp.status = '可用'
AND gp.qty - gp.frozen_qty &gt; 0
AND gp.deleted = 0
AND sa.deleted = 0
AND gp.vehicle_code IN
<foreach collection="vehicleCodes" item="vehicleCode" open="(" separator="," close=")">
#{vehicleCode}

1
nl-module-wms/nl-module-wms-server/src/test/resources/sql/iostorinv/available-inventory.sql
View File

@@ -39,6 +39,7 @@ VALUES (1001, '材料一', FALSE), (1002, '已删除材料', TRUE);
INSERT INTO wms_structattr(struct_id, storagevehicle_code, stor_id, stor_code, stor_name, deleted)
VALUES ('S-001', 'BOX-001', 'STOR-001', 'STOR-CODE-001', '一号仓', FALSE),
('S-001-B', 'BOX-001', 'STOR-001', 'STOR-CODE-001', '一号仓', FALSE),
('S-002', 'BOX-001', 'STOR-002', 'STOR-CODE-002', '二号仓', FALSE),
('S-003', 'BOX-002', 'STOR-001', 'STOR-CODE-001', '一号仓', FALSE),
('S-004', 'BOX-003', 'STOR-001', 'STOR-CODE-001', '一号仓', FALSE),