From 9c12e20237eb56bf2b53f3d751ba618b56954fad Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 17:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
index b37a1c8..9daeba8 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
@@ -41,7 +41,7 @@
private LWhProcureModelService lWhProcureModelService;
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
- private LWhFormInventoryServiceImpl lWhFormInventoryService;
+ private LWhFormInventoryService lWhFormInventoryService;
private LWhFormProcureCoreService lWhFormProcureCoreService;
private LWhFormOutputServiceImpl lWhFormOutputService;
@@ -55,7 +55,7 @@
LWhProcureModelService lWhProcureModelService,
BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
- LWhFormInventoryServiceImpl lWhFormInventoryService,
+ LWhFormInventoryService lWhFormInventoryService,
LWhFormProcureCoreService lWhFormProcureCoreService,
LWhFormOutputServiceImpl lWhFormOutputService
@@ -235,7 +235,7 @@
// 鏌ヨ鍨嬪彿搴撳瓨
int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
- model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setId(IdUtil.generateId());
model.setFromProcureGoodsId(fromProcureGoodsId);
model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
model.setBusinessId(whFormProcureId);
--
Gitblit v1.9.1