From c3324e194441e601d474601bd0f7ac62c120c486 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期一, 13 十一月 2023 16:17:28 +0800 Subject: [PATCH] 出库fix --- consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 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 70332ee..094eb08 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,14 +6,13 @@ import com.consum.model.po.LWhProcureModelUser; import com.consum.model.po.LWhProcureModelUserRecord; import com.walker.infrastructure.utils.NumberGenerator; +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; /** * @ClassName LGoodsUserRecordCoreService @@ -24,6 +23,7 @@ @Service @Transactional(rollbackFor = Exception.class) public class LGoodsUserRecordCoreService { + @Resource private GoodsBaseServiceImpl goodsBaseService; @Resource @@ -54,7 +54,7 @@ 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); // 璁剧疆鏃х殑LAST_RECORD= 0 lGoodsUserRecordService.updSetNotLast(srappedGoodsIds); //鎻掑叆鏂扮殑 @@ -71,7 +71,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 +91,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