From 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:38:56 +0800
Subject: [PATCH] feat: 部门退回/报废公用接口

---
 consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java |   68 ++++++++++++++++-----------------
 1 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index 29710be..5fb144f 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
@@ -15,30 +15,20 @@
 import com.consum.base.pojo.response.FormScrappedGoodsVO;
 import com.consum.base.pojo.response.GoodsModelVO;
 import com.consum.base.pojo.response.LWhFormScrappedExtendVO;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormScrapped;
-import com.consum.model.po.LWhFormScrappedGoods;
-import com.consum.model.po.SDictData;
+import com.consum.model.po.*;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description 鎶ュ簾鍗�
@@ -82,38 +72,46 @@
      * @return 1.鏂板鎶ュ簾鍗�  2.鏂板鎶ュ簾鍗曠墿鍝�
      */
 
-    public int add(LWhFormScrappedParam param, int warehouseType, S_user_core currentUser, FinSysTenantUser sysInfo) {
+    public int add(LWhFormScrappedParam param,  S_user_core currentUser, FinSysTenantUser sysInfo) {
         //1.鏂板鎶ュ簾鍗曡褰�
         LWhFormScrapped lWhFormScrapped = new LWhFormScrapped();
         //鎶ュ簾鍗昳d
         long lWhFormScrappedId = IdUtil.generateId();
         lWhFormScrapped.setId(lWhFormScrappedId);
         lWhFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
-        lWhFormScrapped.setWarehouseType(warehouseType);
+        lWhFormScrapped.setWarehouseType(0);
 
         // 鍏敤
         Long warehouseId = null;
         //浠撳簱鍚嶇О
         String wareHouseName = null;
-        if (warehouseType == 0) {
-            warehouseId = param.getWarehouseId();
-            //鏍规嵁浠撳簱id鏌ヨ浠撳簱
-            BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
-            if (warehouse == null) {
-                log.error("浠撳簱涓嶅瓨鍦�");
-                return 0;
-            }
-            wareHouseName = warehouse.getWarehouseName();
-        } else {
-            // 鏌ヨ閮ㄩ棬鍚嶇О
-            warehouseId = param.getDepartmentId();
-            FinSysTenantDepartment sysTenantDepartment = departmentService.getById(warehouseId);
-            if (sysTenantDepartment == null) {
-                log.error("閮ㄩ棬涓嶅瓨鍦�");
-                return 0;
-            }
-            wareHouseName = sysTenantDepartment.getName();
+        warehouseId = param.getWarehouseId();
+        //鏍规嵁浠撳簱id鏌ヨ浠撳簱
+        BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
+        if (warehouse == null) {
+            log.error("浠撳簱涓嶅瓨鍦�");
+            return 0;
         }
+        wareHouseName = warehouse.getWarehouseName();
+//        if (0 == 0) {
+//            warehouseId = param.getWarehouseId();
+//            //鏍规嵁浠撳簱id鏌ヨ浠撳簱
+//            BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
+//            if (warehouse == null) {
+//                log.error("浠撳簱涓嶅瓨鍦�");
+//                return 0;
+//            }
+//            wareHouseName = warehouse.getWarehouseName();
+//        } else {
+//            // 鏌ヨ閮ㄩ棬鍚嶇О
+//            warehouseId = param.getDepartmentId();
+//            FinSysTenantDepartment sysTenantDepartment = departmentService.getById(warehouseId);
+//            if (sysTenantDepartment == null) {
+//                log.error("閮ㄩ棬涓嶅瓨鍦�");
+//                return 0;
+//            }
+//            wareHouseName = sysTenantDepartment.getName();
+//        }
         lWhFormScrapped.setWarehouseId(warehouseId);
         lWhFormScrapped.setWarehouseName(wareHouseName);
         lWhFormScrapped.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
@@ -167,7 +165,7 @@
                 LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
                 scrappedGoods.setId(IdUtil.generateId());
                 //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
-                int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, scrappedGoods.getBaseGoodsModelsId(), 1, null);
+                int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, scrappedGoods.getBaseGoodsModelsId(), 1, null);
                 if (params.getCounts() > goodsNum) {
                     log.error("鎶ュ簾鏁伴噺澶т簬搴撳瓨鏁伴噺");
                     return 0;

--
Gitblit v1.9.1