From 1a4f00e0b4d24ae72c7d95e31e685d9a2be0aa62 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期四, 21 十二月 2023 13:46:29 +0800 Subject: [PATCH] 机构导入 --- consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 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 be46afc..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 @@ -1,11 +1,11 @@ package com.consum.base.service; +import com.consum.base.core.utils.IdUtil; 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 org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -41,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; } @@ -54,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); @@ -72,18 +75,18 @@ 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("鎿嶄綔澶辫触!鍨嬪彿鏁伴噺涓嶈冻"); } for (Long toUserGoodsId : toUserGoodsIds) { LGoodsUserRecord tmp = new LGoodsUserRecord(); - tmp.setId(NumberGenerator.getLongSequenceNumber()); + tmp.setId(IdUtil.generateId()); tmp.setWhGoodsId(toUserGoodsId); tmp.setRecordType(1); tmp.setTransBusinessId(transBusinessId); -- Gitblit v1.9.1