From b268fd73f060108b8214ed1afcbbf03480435f3a Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期五, 15 十二月 2023 17:27:41 +0800 Subject: [PATCH] 1.出库手续回显 2.调拨申请时库存查询更换接口 3.调拨出库时从已有物品所在的仓库中选择 --- consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java index 2eccb93..3722c5b 100644 --- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java @@ -1,6 +1,7 @@ package com.consum.base.service.impl; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -227,7 +228,8 @@ List<Long> outGoodsId = null; synchronized (warehouseModelLockObj) { // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺 - int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseType, outWarehouseId, + List<Long> warehouseIds = new ArrayList<>(Arrays.asList(outWarehouseId)); + int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseType, warehouseIds, baseGoodsModelsId, queryModelStatus, buyType); if (goodsModelNum < counts) { log.error("鍑哄簱澶辫触锛佸瀷鍙穥} 鐨勬暟閲忎笉瓒筹紝闇�瑕佽皟鎷▄}涓紝浠撳簱涓幇瀛榹}涓�", baseGoodsModelsId, counts, goodsModelNum); @@ -380,8 +382,9 @@ throw new RuntimeException("鍏ュ簱鍗曞け璐ワ紝鏈煡璇㈠埌鐗╁搧锛�"); } // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺 + List<Long> warehouseIds = new ArrayList<>(Arrays.asList(inWarehouseId)); int goodsModelNum = - lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, 1, null); + lWhGoodsService.queryGoodsModelNum(inWarehouseType, warehouseIds, baseGoodsModelsId, 1, null); // 搴撳瓨鐗╁搧璇︽儏锛圠_WH_GOODS锛変腑 鐘舵�佽缃负1 lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName, -- Gitblit v1.9.1