From 209d9c6f60d96fc29fad0bd2f9dad8fe8424f91f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 17 十一月 2023 18:10:47 +0800
Subject: [PATCH] 调拨管理
---
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
index 31c2524..06a2a59 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
@@ -1,24 +1,25 @@
package com.consum.base.service;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.util.LockManage;
-import com.consum.model.po.*;
+import com.consum.base.core.utils.LockManage;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormScrapped;
+import com.consum.model.po.LWhFormScrappedGoods;
+import com.consum.model.po.LWhGoodsRecord;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
/**
* @ClassName LWhFormScrappedCoreService
- * @Author cy
* @Date 2023/10/30
* @Description
* @Version 1.0
@@ -26,7 +27,8 @@
@Service
@Slf4j
public class LWhFormScrappedCoreService {
- private LWhFormScrappedService lWhFormScrappedService;
+
+ private GoodsBaseServiceImpl goodsBaseService;
private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
@@ -35,20 +37,21 @@
private LWarehouseFlowService lWarehouseFlowService;
@Autowired
- public LWhFormScrappedCoreService(LWhFormScrappedService lWhFormScrappedService,
- LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
- LWhGoodsService lWhGoodsService,
- LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
- LWhGoodsRecordService lWhGoodsRecordService,
- LWarehouseFlowService lWarehouseFlowService) {
- this.lWhFormScrappedService = lWhFormScrappedService;
+ public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
+ LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
+ BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ LWhGoodsService lWhGoodsService,
+ LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
+ LWhGoodsRecordService lWhGoodsRecordService,
+ LWarehouseFlowService lWarehouseFlowService) {
+// this.lWhFormScrappedService = lWhFormScrappedService;
this.lWhFormScrappedGoodsService = lWhFormScrappedGoodsService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
this.lWhGoodsRecordService = lWhGoodsRecordService;
this.lWarehouseFlowService = lWarehouseFlowService;
+ this.goodsBaseService = goodsBaseService;
}
@@ -64,7 +67,7 @@
return null;
}
LWhFormScrapped lWhFormScrapped = new LWhFormScrapped(formScrappedId);
- lWhFormScrapped = lWhFormScrappedService.get(lWhFormScrapped);
+ lWhFormScrapped = goodsBaseService.get(lWhFormScrapped);
if (lWhFormScrapped != null && lWhFormScrapped.getStates() != 0) {
log.error("鎶ュ簾澶辫触锛佽妫�鏌ユ姤搴熷崟鐘舵��");
return null;
@@ -89,7 +92,8 @@
}
// 鎸夊瀷鍙峰垎缁�
- Map<Long, List<LWhFormScrappedGoods>> modelGroup = formScrappedGoods.stream().collect(Collectors.groupingBy(LWhFormScrappedGoods::getBaseGoodsModelsId));
+ Map<Long, List<LWhFormScrappedGoods>> modelGroup = formScrappedGoods.stream()
+ .collect(Collectors.groupingBy(LWhFormScrappedGoods::getBaseGoodsModelsId));
for (Map.Entry<Long, List<LWhFormScrappedGoods>> entry : modelGroup.entrySet()) {
//瑙勬牸鍨嬪彿缂栧彿
Long baseGoodsModelsId = entry.getKey();
@@ -135,7 +139,8 @@
//浣跨敤浜哄憳鍚嶇О
String userName = formScrappedGood.getUserName();
// 鏍规嵁鍒嗗彂鍗曘�佽鏍煎瀷鍙风紪鍙枫�佷娇鐢ㄤ汉鍛樺悕绉帮紝杩涜鎶ュ簾
- srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, transBusinessId, userName, baseGoodsModelsId, (short) 2, counts);
+ srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, transBusinessId, userName, baseGoodsModelsId,
+ (short) 2, counts);
}
if (CollectionUtils.isEmpty(srappedGoodsIds) || srappedGoodsIds.size() < counts) {
log.error("瑕佹姤搴熺殑鐗╁搧鏁伴噺涓嶈冻锛�");
@@ -148,7 +153,7 @@
whGoodsRecord.setEndCount(goodsModelNum - counts);
// 璁剧疆鐗╁搧涓烘姤搴熺姸鎬�
- lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, (short) 3);
+ lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 2);
}
@@ -174,8 +179,8 @@
return null;
}
// 鏇存柊鎶ュ簾鍗�
- lWhFormScrapped = new LWhFormScrapped(formScrappedId);
- lWhFormScrapped = lWhFormScrappedService.get(lWhFormScrapped);
+ lWhFormScrapped = new LWhFormScrapped(formScrappedId);
+ lWhFormScrapped = goodsBaseService.get(lWhFormScrapped);
if (lWhFormScrapped != null && lWhFormScrapped.getStates() != 0) {
log.error("鎶ュ簾澶辫触锛佽妫�鏌ユ姤搴熷崟鐘舵��");
return null;
@@ -185,7 +190,7 @@
lWhFormScrapped.setOperatorId(userId);
lWhFormScrapped.setOperatorName(nickName);
lWhFormScrapped.setDealTime(dealTime);
- lWhFormScrappedService.update(lWhFormScrapped);
+ goodsBaseService.update(lWhFormScrapped);
return lWarehouseFlowId;
}
--
Gitblit v1.9.1