From 6d1fcbe98f3dc8f75ac3f7784152b5a04942a89f Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期二, 31 十月 2023 19:26:29 +0800
Subject: [PATCH] feat: 报废单报废
---
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
index 6f37d34..a45460e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
@@ -65,6 +65,7 @@
}
// 鏌ヨ浠撳簱淇℃伅
Long warehouseFlowId = warehouseFlow.getId();
+ Integer warehouseType = warehouseFlow.getWarehouseType();
Long warehouseId = warehouseFlow.getWarehouseId();
Long dealTime = warehouseFlow.getDealTime();
BaseWarehouse baseWarehouses = lWarehouseFlowService.get(new BaseWarehouse(warehouseId));
@@ -118,10 +119,10 @@
whGoodsRecord.setThisType(1);
//閫氳繃LockManage鑾峰緱閿�
- Object warehouseModelLockObj = LockManage.acquireLock(warehouseId, baseGoodsModelsId);
+ Object warehouseModelLockObj = LockManage.acquireLock(warehouseType, warehouseId, baseGoodsModelsId);
synchronized (warehouseModelLockObj) {
// 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseId, baseGoodsModelsId, (short) 1, null);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType,warehouseId, baseGoodsModelsId, (short) 1, null);
whGoodsRecord.setInitialCount(goodsModelNum);
whGoodsRecord.setThisCount(modelCount);
whGoodsRecord.setEndCount(goodsModelNum + modelCount);
--
Gitblit v1.9.1