From 8a0a1cff8bf543cb008a2866a944ad868a31f9a7 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 27 十一月 2023 14:55:13 +0800
Subject: [PATCH] 调整盘点物品顺序

---
 consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 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 b7b201d..0811cfc 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
@@ -1,9 +1,11 @@
 package com.consum.base.service;
 
+import cn.hutool.core.convert.Convert;
 import com.consum.base.core.CodeGeneratorEnum;
 import com.consum.base.core.CodeGeneratorService;
 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.LockManage;
 import com.consum.model.po.*;
 import com.iplatform.model.po.S_user_core;
@@ -15,6 +17,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -34,6 +37,7 @@
     private CodeGeneratorService codeGeneratorService;
     private LWhProcureModelService lWhProcureModelService;
     private LWhFormOutputService lWhFormOutputService;
+    private LWhWarningCoreServiceImpl lWhWarningCoreService;
     private LWarehouseFlowService lWarehouseFlowService;
     private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
     private LWhGoodsRecordService lWhGoodsRecordService;
@@ -46,7 +50,8 @@
                                     LWhFormOutputService lWhFormOutputService,
                                     LWarehouseFlowService lWarehouseFlowService,
                                     LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
-                                    LWhGoodsRecordService lWhGoodsRecordService) {
+                                    LWhGoodsRecordService lWhGoodsRecordService,
+                                    LWhWarningCoreServiceImpl lWhWarningCoreService) {
         this.baseGoodsTemplateService = baseGoodsTemplateService;
         this.lWhGoodsService = lWhGoodsService;
         this.codeGeneratorService = codeGeneratorService;
@@ -55,6 +60,7 @@
         this.lWarehouseFlowService = lWarehouseFlowService;
         this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
         this.lWhGoodsRecordService = lWhGoodsRecordService;
+        this.lWhWarningCoreService = lWhWarningCoreService;
     }
 
 
@@ -121,6 +127,7 @@
         whFormOutput.setOutputName("璋冩嫧鍑哄簱");
         whFormOutput.setWarehouseId(outWarehouseId);
         whFormOutput.setWarehouseName(outWarehouseName);
+        // 杩欐牱灏辨煡璇笉鍒拌鏉¤褰�
         whFormOutput.setAgencyId(null);
         whFormOutput.setAgencyName(null);
         whFormOutput.setOperatorId(currentUser.getId());
@@ -145,7 +152,7 @@
      * @return 娴佹按璁板綍鎬昏〃ID
      */
     @Transactional(rollbackFor = Exception.class)
-    public Long outFormByTransId(Long outWarehouseFormId,WhBusinessEnum businessType, S_user_core currentUser, Long dealTime) {
+    public Long outFormByTransId(Long outWarehouseFormId, WhBusinessEnum businessType, S_user_core currentUser, Long dealTime) {
         if (outWarehouseFormId == null) {
             return null;
         }
@@ -178,9 +185,9 @@
         long lWarehouseFlowBusinessId = outWarehouseFormId;
 
         // 鐗╁搧鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
-        short queryModelStatusT = 1;
+        Integer queryModelStatusT = 1;
         //閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
-        Short buyTypeT = null;
+        Integer buyTypeT = null;
         Integer modGoodsTransferingStatusT = null;
         String outputCode = lWhFormOutput.getOutputCode();
         if ((BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue() + "").equals(outputCode)) {
@@ -198,13 +205,15 @@
             buyTypeT = null;
             modGoodsTransferingStatusT = 4;
         }
-        short queryModelStatus = queryModelStatusT;
-        Short buyType = buyTypeT;
+        Integer queryModelStatus = queryModelStatusT;
+        Integer buyType = buyTypeT;
         Integer modGoodsTransferingStatus = modGoodsTransferingStatusT;
 
+        ArrayList<Long> allChangModelList = new ArrayList<>();
         goodsModelNumList.forEach(itemModelInfo -> {
             // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
             Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();
+            allChangModelList.add(baseGoodsModelsId);
             // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鏌愪釜鍨嬪彿鐨勬暟閲�
             Integer counts = itemModelInfo.getCounts();
 
@@ -288,6 +297,8 @@
         lWhFormOutput.setWarehouseFlowId(lWarehouseFlowId);
         lWhFormOutputService.update(lWhFormOutput);
 
+        //褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
+        lWhWarningCoreService.updateKuCun(Convert.toShort(outWarehouseType, (short) 0), outWarehouseId, allChangModelList, null, dealTime);
         return lWarehouseFlowId;
     }
 

--
Gitblit v1.9.1