From 2af69a47b08aa4988cc9733a361a733a671a5f81 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 17:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
index 1a62973..14636b1 100644
--- a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
@@ -6,7 +6,6 @@
 import com.consum.model.po.LWhFormTransfer;
 import com.consum.model.po.LWhProcureModelUser;
 import com.consum.model.po.LWhProcureModelUserRecord;
-import com.walker.infrastructure.utils.NumberGenerator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -42,7 +41,8 @@
      * @return
      */
     public boolean modifyGoodsUser(Long oldProcureModelUserRecordId, Long newProcureModelUserRecordId) {
-        LWhProcureModelUserRecord lWhProcureModelUserRecord = goodsBaseService.get(new LWhProcureModelUserRecord(newProcureModelUserRecordId));
+        LWhProcureModelUserRecord lWhProcureModelUserRecord =
+            goodsBaseService.get(new LWhProcureModelUserRecord(newProcureModelUserRecordId));
         if (lWhProcureModelUserRecord == null) {
             return false;
         }
@@ -55,14 +55,16 @@
         LWhFormTransfer whFormTransfer = goodsBaseService.get(new LWhFormTransfer(transBusinessId));
         Integer inWarehouseType = whFormTransfer.getInWarehouseType();
         Long inWarehouseId = whFormTransfer.getInWarehouseId();
-        // 灏嗘墍鏈夌墿鍝佽缃负鏈垎鍙�
-        List<Long> srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId, transBusinessId, null, null, null, null);
-        lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
+        // 灏嗘墍鏈夊凡涓嬪彂鐗╁搧璁剧疆涓烘湭鍒嗗彂 濡傛灉鍙戠敓浜嗛��鍥烇紝姝ゆ椂鏁伴噺鍒欏皬浜庡垎鍙戞椂鐨勬暟閲�!
+        List<Long> srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId,
+            transBusinessId, null, null, (short)2, null);
+        lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 1);
         // 鍒犻櫎璇ヨ皟鎷ㄥ崟鏃ф湁浣跨敤璁板綍
-        lGoodsUserRecordService.delete(new LGoodsUserRecord(), "where TRANS_BUSINESS_ID =" + transBusinessId, new HashMap<>());
+        lGoodsUserRecordService.delete(new LGoodsUserRecord(), "where TRANS_BUSINESS_ID =" + transBusinessId,
+            new HashMap<>());
         // 璁剧疆鏃х殑LAST_RECORD= 0
         lGoodsUserRecordService.updSetNotLast(srappedGoodsIds);
-        //鎻掑叆鏂扮殑
+        // 鎻掑叆鏂扮殑
         LWhProcureModelUser modelUser = new LWhProcureModelUser();
         modelUser.setProcureModelUserRecordId(newProcureModelUserRecordId);
         List<LWhProcureModelUser> modelUserList = goodsBaseService.select(modelUser);
@@ -73,11 +75,11 @@
         for (LWhProcureModelUser lWhProcureModelUser : modelUserList) {
             Long baseGoodsModelsId = lWhProcureModelUser.getBaseGoodsModelsId();
             Integer goodsNum = lWhProcureModelUser.getGoodsNum();
-            //閫氳繃LockManage鑾峰緱閿�
+            // 閫氳繃LockManage鑾峰緱閿�
             Object warehouseModelLockObj = LockManage.acquireLock(inWarehouseType, inWarehouseId, baseGoodsModelsId);
             synchronized (warehouseModelLockObj) {
-                List<Long> toUserGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId, transBusinessId, null, baseGoodsModelsId,
-                    (short) 1, goodsNum);
+                List<Long> toUserGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId,
+                    transBusinessId, null, baseGoodsModelsId, (short)1, goodsNum);
                 if (CollectionUtils.isEmpty(toUserGoodsIds)) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     throw new RuntimeException("鎿嶄綔澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
@@ -103,8 +105,4 @@
         return true;
     }
 
-    public static void main(String[] args) {
-        System.out.println(IdUtil.generateId());
-        System.out.println(NumberGenerator.getLongSequenceNumber() );
-    }
 }

--
Gitblit v1.9.1