From bf321083251d5a14f4043ab0d70295b7af8610e6 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 11:19:24 +0800
Subject: [PATCH] feat: id生成方法替换

---
 consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index dd3ce96..d8573f1 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -6,6 +6,7 @@
 import com.consum.base.core.WhBusinessEnum;
 import com.consum.base.core.param.BaseWarehouseParam1;
 import com.consum.base.core.service.LWhWarningCoreServiceImpl;
+import com.consum.base.core.utils.IdUtil;
 import com.consum.base.core.utils.LockManage;
 import com.consum.model.po.*;
 import com.iplatform.model.po.S_user_core;
@@ -72,7 +73,7 @@
      * @return 鍑哄簱鍗旾d
      */
     @Transactional(rollbackFor = Exception.class)
-    public Long createOutFormByTransId(Long whFormTransferId, S_user_core currentUser, Long dealTime) {
+    public Long createOutFormByTransId(Long whFormTransferId, WhBusinessEnum businessEnum, S_user_core currentUser, Long dealTime) {
         if (whFormTransferId == null) {
             return null;
         }
@@ -89,10 +90,11 @@
         }
 
         //鐢宠璋冩嫧鐨勭墿鍝�
-        List<LWhProcureModel> goodsModelNumList = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, whFormTransferId);
+        List<LWhProcureModel> goodsModelNumList = lWhProcureModelService.getModelByForm(businessEnum, whFormTransferId);
         if (CollectionUtils.isEmpty(goodsModelNumList)) {
             log.error("娌℃湁瑕佸叆搴撶殑鐗╁搧");
-            return null;
+            throw new RuntimeException("娌℃湁瑕佸叆搴撶殑鐗╁搧");
+//            return null;
         }
         Long outWarehouseId = lWhFormTransfer.getOutWarehouseId();
         String outWarehouseName = lWhFormTransfer.getOutWarehouseName();
@@ -104,7 +106,7 @@
         // 璋冩嫧鍗曠墿鍝� 宸茬粡鎸夊瀷鍙峰垎濂戒簡
         goodsModelNumList.forEach(itemModelInfo -> {
             // 澶嶇敤瀵硅薄
-            itemModelInfo.setId(NumberGenerator.getLongSequenceNumber());
+            itemModelInfo.setId(IdUtil.generateId());
             itemModelInfo.setFromProcureGoodsId(null);
             itemModelInfo.setBusinessType(3);
             itemModelInfo.setBusinessId(outWarehouseFormId);
@@ -191,21 +193,22 @@
         Integer buyTypeT = null;
         Integer modGoodsTransferingStatusT = null;
         short businessTypeValue = businessType.getValue();
-        if (BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue()  == businessTypeValue) {
+        if (BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue() == businessTypeValue) {
             //璋冩嫧鍑哄簱
             queryModelStatusT = 1;
             buyTypeT = 1;
             lWarehouseFlowBusinessId = lWhFormOutput.getTransBusinessId();
             modGoodsTransferingStatusT = 0;
-        } else if (BaseWarehouseParam1.In_OutPutTypeEnum.Dept_Lending_Out.getValue()  == businessTypeValue) {
+        } else if (BaseWarehouseParam1.In_OutPutTypeEnum.Dept_Lending_Out.getValue() == businessTypeValue) {
             //  閮ㄩ棬浠撳簱 鍒嗗彂鍑哄簱
 //            queryModelStatusT = 2;
-        } else if (BaseWarehouseParam1.In_OutPutTypeEnum.Fragmentary_Output.getValue()  == businessTypeValue) {
+            lWarehouseFlowBusinessId = lWhFormOutput.getTransBusinessId();
+        } else if (BaseWarehouseParam1.In_OutPutTypeEnum.Fragmentary_Output.getValue() == businessTypeValue) {
             //  闆舵槦鍑哄簱
             queryModelStatusT = 1;
             buyTypeT = null;
             modGoodsTransferingStatusT = 4;
-        }else if (BaseWarehouseParam1.In_OutPutTypeEnum.Inventory_Output.getValue()  == businessTypeValue) {
+        } else if (BaseWarehouseParam1.In_OutPutTypeEnum.Inventory_Output.getValue() == businessTypeValue) {
             //  鐩樼偣鍑哄簱
             queryModelStatusT = 1;
             buyTypeT = null;
@@ -304,7 +307,9 @@
         lWhFormOutputService.update(lWhFormOutput);
 
         //褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
-        lWhWarningCoreService.updateKuCun(Convert.toShort(outWarehouseType, (short) 0), outWarehouseId, allChangModelList, null, dealTime);
+        if (outWarehouseType == 0){
+            lWhWarningCoreService.updateKuCun(Convert.toShort(outWarehouseType, (short) 0), outWarehouseId, allChangModelList, null, dealTime);
+        }
         return lWarehouseFlowId;
     }
 

--
Gitblit v1.9.1