From 3836720e3b0fc9ab884d178e0ac27e942b175da2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 15:23:01 +0800
Subject: [PATCH] 报废单添加金额字段
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 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..f0b40e6 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
@@ -1,13 +1,11 @@
package com.consum.base.service;
-import com.consum.base.core.CodeGeneratorEnum;
-import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.utils.IdUtil;
-import com.consum.model.po.*;
-import com.iplatform.model.po.S_user_core;
-import com.walker.infrastructure.utils.NumberGenerator;
-import lombok.extern.slf4j.Slf4j;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -15,11 +13,22 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormInventory;
+import com.consum.model.po.LWhFormInventoryGoods;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormProcureGoods;
+import com.consum.model.po.LWhProcureModel;
+import com.iplatform.model.po.S_user_core;
+import com.walker.infrastructure.utils.NumberGenerator;
+
+import lombok.extern.slf4j.Slf4j;
/**
* @ClassName LWhFormInventoryCoreService
@@ -35,37 +44,37 @@
private LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods;
private LWhFormOutputCoreService lWhFormOutputCoreService;
private CodeGeneratorService codeGeneratorService;
- private LWhFormProcureService lWhFormProcureService;
- private BaseWarehouseServiceImpl baseWarehouseService;
- private LWhFormProcureGoodsService lWhFormProcureGoodsService;
+ private LWhFormProcureService lWhFormProcureServiceImpl;
+ private BaseWarehouseService baseWarehouseService;
+ private LWhFormProcureGoodsService lWhFormProcureGoodsServiceImpl;
private LWhProcureModelService lWhProcureModelService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
- private LWhFormInventoryServiceImpl lWhFormInventoryService;
+ private LWhFormInventoryService lWhFormInventoryService;
private LWhFormProcureCoreService lWhFormProcureCoreService;
- private LWhFormOutputServiceImpl lWhFormOutputService;
+ private LWhFormOutputService lWhFormOutputService;
@Autowired
public LWhFormInventoryCoreService(LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods,
LWhFormOutputCoreService lWhFormOutputCoreService,
CodeGeneratorService codeGeneratorService,
- LWhFormProcureService lWhFormProcureService,
- BaseWarehouseServiceImpl baseWarehouseService,
- LWhFormProcureGoodsService lWhFormProcureGoodsService,
+ LWhFormProcureService lWhFormProcureServiceImpl,
+ BaseWarehouseService baseWarehouseService,
+ LWhFormProcureGoodsService lWhFormProcureGoodsServiceImpl,
LWhProcureModelService lWhProcureModelService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
- LWhFormInventoryServiceImpl lWhFormInventoryService,
+ LWhFormInventoryService lWhFormInventoryService,
LWhFormProcureCoreService lWhFormProcureCoreService,
- LWhFormOutputServiceImpl lWhFormOutputService
+ LWhFormOutputService lWhFormOutputService
) {
this.lWhFormInventoryGoods = lWhFormInventoryGoods;
this.lWhFormOutputCoreService = lWhFormOutputCoreService;
this.codeGeneratorService = codeGeneratorService;
- this.lWhFormProcureService = lWhFormProcureService;
+ this.lWhFormProcureServiceImpl = lWhFormProcureServiceImpl;
this.baseWarehouseService = baseWarehouseService;
- this.lWhFormProcureGoodsService = lWhFormProcureGoodsService;
+ this.lWhFormProcureGoodsServiceImpl = lWhFormProcureGoodsServiceImpl;
this.lWhProcureModelService = lWhProcureModelService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
@@ -152,7 +161,7 @@
inOutMap.putAll(ckMap);
Long lWhFormOutputId = (Long) inOutMap.get("outId");
//2.鏍规嵁鍑哄簱鍗曞嚭搴�
- Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.PANDIAN, currentUser, stopTime);
+ Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.PANDIAN, currentUser, stopTime,null);
if (lWarehouseFlowId == null) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
// throw new RuntimeException("鍒涘缓鍑哄簱鍗曞け璐�");
@@ -203,7 +212,7 @@
lWhFormProcure.setStates(1);
lWhFormProcure.setAgencyId(baseWarehouse.getAgencyId());
lWhFormProcure.setAgencyName(baseWarehouse.getAgencyName());
- int result = lWhFormProcureService.insert(lWhFormProcure);
+ int result = lWhFormProcureServiceImpl.insert(lWhFormProcure);
if (result == 0) {
return null;
}
@@ -235,7 +244,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);
@@ -247,7 +256,7 @@
whProcureModeLlist.add(model);
procureGoodList.add(procureGood);
}
- lWhFormProcureGoodsService.insertBatch(procureGoodList);
+ lWhFormProcureGoodsServiceImpl.insertBatch(procureGoodList);
lWhProcureModelService.insertBatch(whProcureModeLlist);
HashMap<String, Object> rtnMap = new HashMap<>();
--
Gitblit v1.9.1