From d72f95b3ffb6020996c04f6f9df3f6aa9977d5a3 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 21:33:22 +0800
Subject: [PATCH] fix: 去除数据大屏
---
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 18 ++++++++++++++----
1 files changed, 14 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 70332ee..1a62973 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,5 +1,6 @@
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;
@@ -13,6 +14,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -24,6 +26,7 @@
@Service
@Transactional(rollbackFor = Exception.class)
public class LGoodsUserRecordCoreService {
+
@Resource
private GoodsBaseServiceImpl goodsBaseService;
@Resource
@@ -54,7 +57,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,14 +76,15 @@
//閫氳繃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);
@@ -90,11 +96,15 @@
tmp.setLastRecord(1);
goodsUserRecords.add(tmp);
}
- lWhGoodsService.modGoodsTransfering(toUserGoodsIds, null, null, null, (short) 2);
+ lWhGoodsService.modGoodsTransfering(toUserGoodsIds, null, null, null, 2);
lGoodsUserRecordService.insertBatch(goodsUserRecords);
}
}
return true;
}
+ public static void main(String[] args) {
+ System.out.println(IdUtil.generateId());
+ System.out.println(NumberGenerator.getLongSequenceNumber() );
+ }
}
--
Gitblit v1.9.1