From 090bf407236ef5be8ea7ba803a56fdcc2dcc1ce3 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期三, 01 十一月 2023 17:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 8523934..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
@@ -31,18 +31,20 @@
private SimpleJdbcCall simpleJdbcCall;
private LWarehouseFlowService lWarehouseFlowService;
private LWhGoodsService lWhGoodsService;
+ private LWhGoodsRecordService lWhGoodsRecordService;
private LWhFormTransferService lWhFormTransferService;
private LWhFormOutputCoreService lWhFormOutputCoreService;
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
@Autowired
- public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, LWhFormTransferService lWhFormTransferService, LWhFormOutputCoreService lWhFormOutputCoreService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService) {
+ public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, LWhFormTransferService lWhFormTransferService, LWhFormOutputCoreService lWhFormOutputCoreService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordService) {
this.jdbcTemplate = jdbcTemplate;
this.lWarehouseFlowService = lWarehouseFlowService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhFormTransferService = lWhFormTransferService;
this.lWhFormOutputCoreService = lWhFormOutputCoreService;
this.lWhGoodsService = lWhGoodsService;
+ this.lWhGoodsRecordService = lWhGoodsRecordService;
this.simpleJdbcCall = new SimpleJdbcCall(jdbcTemplate).withProcedureName("InsertL_WH_GOODS");
}
@@ -63,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));
@@ -116,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);
@@ -138,6 +141,7 @@
supplier, buyType, goodsUnit, price, procureTime, 1, dealTime, counts);
});
}
+ lWhGoodsRecordService.insert(whGoodsRecord);
});
return 1;
--
Gitblit v1.9.1