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/LGoodsUserRecordCoreService.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 ea5841e..be46afc 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
@@ -1,6 +1,6 @@
package com.consum.base.service;
-import com.consum.base.core.util.LockManage;
+import com.consum.base.core.utils.LockManage;
import com.consum.model.po.LGoodsUserRecord;
import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.LWhProcureModelUser;
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -24,6 +25,7 @@
@Service
@Transactional(rollbackFor = Exception.class)
public class LGoodsUserRecordCoreService {
+
@Resource
private GoodsBaseServiceImpl goodsBaseService;
@Resource
@@ -54,7 +56,9 @@
Long inWarehouseId = whFormTransfer.getInWarehouseId();
// 灏嗘墍鏈夌墿鍝佽缃负鏈垎鍙�
List<Long> srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId, transBusinessId, null, null, null, null);
- lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, (short) 3);
+ lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
+ // 鍒犻櫎璇ヨ皟鎷ㄥ崟鏃ф湁浣跨敤璁板綍
+ lGoodsUserRecordService.delete(new LGoodsUserRecord(), "where TRANS_BUSINESS_ID =" + transBusinessId, new HashMap<>());
// 璁剧疆鏃х殑LAST_RECORD= 0
lGoodsUserRecordService.updSetNotLast(srappedGoodsIds);
//鎻掑叆鏂扮殑
@@ -71,7 +75,8 @@
//閫氳繃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("鎿嶄綔澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
@@ -90,7 +95,7 @@
tmp.setLastRecord(1);
goodsUserRecords.add(tmp);
}
- lWhGoodsService.modGoodsTransfering(toUserGoodsIds, null, null, null, (short) 2);
+ lWhGoodsService.modGoodsTransfering(toUserGoodsIds, null, null, null, 2);
lGoodsUserRecordService.insertBatch(goodsUserRecords);
}
}
--
Gitblit v1.9.1