From 11f925fdce0f58d1f321f3a13a3f3e84221c6912 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 13 十一月 2023 09:27:14 +0800
Subject: [PATCH] 整理代码

---
 consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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 d4b1cb4..28d8941 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,7 +1,7 @@
 package com.consum.base.service;
 
 import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.util.LockManage;
+import com.consum.base.core.utils.LockManage;
 import com.consum.model.po.*;
 import com.iplatform.model.po.S_user_core;
 import com.walker.infrastructure.utils.CollectionUtils;
@@ -18,7 +18,6 @@
 
 /**
  * @ClassName LWhFormScrappedCoreService
- * @Author cy
  * @Date 2023/10/30
  * @Description
  * @Version 1.0
@@ -26,7 +25,7 @@
 @Service
 @Slf4j
 public class LWhFormScrappedCoreService {
-    private LWhFormScrappedServiceImpl lWhFormScrappedService;
+    private GoodsBaseServiceImpl goodsBaseService;
     private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
     private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
     private LWhGoodsService lWhGoodsService;
@@ -35,20 +34,21 @@
     private LWarehouseFlowService lWarehouseFlowService;
 
     @Autowired
-    public LWhFormScrappedCoreService(LWhFormScrappedServiceImpl lWhFormScrappedService,
+    public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
                                       LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
                                       BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
                                       LWhGoodsService lWhGoodsService,
                                       LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
                                       LWhGoodsRecordService lWhGoodsRecordService,
                                       LWarehouseFlowService lWarehouseFlowService) {
-        this.lWhFormScrappedService = lWhFormScrappedService;
+//        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 +64,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;
@@ -174,8 +174,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 +185,7 @@
         lWhFormScrapped.setOperatorId(userId);
         lWhFormScrapped.setOperatorName(nickName);
         lWhFormScrapped.setDealTime(dealTime);
-        lWhFormScrappedService.update(lWhFormScrapped);
+        goodsBaseService.update(lWhFormScrapped);
         return lWarehouseFlowId;
     }
 

--
Gitblit v1.9.1