From 170c89b9b8e6d5c3117d53e7b38f782651ebfcde Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 14:04:04 +0800
Subject: [PATCH] 物品统计表中总数量改为在库数量+报废数量
---
consum-base/src/main/java/com/consum/base/service/core/LWhFormScrappedCoreService.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormScrappedCoreService.java
similarity index 93%
rename from consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/core/LWhFormScrappedCoreService.java
index c652171..9b91dca 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormScrappedCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.service.impl;
+package com.consum.base.service.core;
import java.util.ArrayList;
import java.util.Arrays;
@@ -13,15 +13,15 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.GoodsBaseServiceImpl;
+import com.consum.base.service.GoodsBaseService;
import com.consum.base.service.LWarehouseFlowService;
import com.consum.base.service.LWhFormScrappedGoodsService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormScrapped;
import com.consum.model.po.LWhFormScrappedGoods;
@@ -43,28 +43,27 @@
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public class LWhFormScrappedCoreService {
- private GoodsBaseServiceImpl goodsBaseService;
+ private GoodsBaseService goodsBaseService;
private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
- private LWarehouseFlowService lWarehouseFlowService;
- private LWhWarningCoreServiceImpl lWhWarningCoreService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
+ private LWhWarningCoreService lWhWarningCoreService;
@Autowired
- public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
+ public LWhFormScrappedCoreService(GoodsBaseService goodsBaseService,
LWhFormScrappedGoodsService lWhFormScrappedGoodsService, BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService, LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
- LWhGoodsRecordService lWhGoodsRecordServiceImpl, LWarehouseFlowService lWarehouseFlowService,
- LWhWarningCoreServiceImpl lWhWarningCoreService) {
- // this.lWhFormScrappedService = lWhFormScrappedService;
+ LWhGoodsRecordService lWhGoodsRecordServiceImpl, LWarehouseFlowService lWarehouseFlowServiceImpl,
+ LWhWarningCoreService lWhWarningCoreService) {
this.lWhFormScrappedGoodsService = lWhFormScrappedGoodsService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
this.lWhGoodsRecordServiceImpl = lWhGoodsRecordServiceImpl;
- this.lWarehouseFlowService = lWarehouseFlowService;
+ this.lWarehouseFlowServiceImpl = lWarehouseFlowServiceImpl;
this.goodsBaseService = goodsBaseService;
this.lWhWarningCoreService = lWhWarningCoreService;
}
@@ -211,7 +210,7 @@
warehouseFlow.setOperatorName(nickName);
warehouseFlow.setDealTime(dealTime);
// 鎻掑叆娴佹按鎬昏〃
- int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
+ int flowInsertFlag = lWarehouseFlowServiceImpl.insert(warehouseFlow);
if (flowInsertFlag == 0) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return null;
--
Gitblit v1.9.1