From b0841619e23dd01b8fba9561ad9036c7c3d6aa08 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期二, 14 十一月 2023 14:05:20 +0800 Subject: [PATCH] 出库单管理 --- consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 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..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 @@ -1,19 +1,18 @@ 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; 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