From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 17:24:34 +0800
Subject: [PATCH] 盘点查询返回结果修改
---
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 17 +++++++++++++----
1 files changed, 13 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 094eb08..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,18 +1,21 @@
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 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.HashMap;
+import java.util.List;
/**
* @ClassName LGoodsUserRecordCoreService
@@ -55,6 +58,8 @@
// 灏嗘墍鏈夌墿鍝佽缃负鏈垎鍙�
List<Long> srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId, transBusinessId, null, null, null, null);
lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
+ // 鍒犻櫎璇ヨ皟鎷ㄥ崟鏃ф湁浣跨敤璁板綍
+ lGoodsUserRecordService.delete(new LGoodsUserRecord(), "where TRANS_BUSINESS_ID =" + transBusinessId, new HashMap<>());
// 璁剧疆鏃х殑LAST_RECORD= 0
lGoodsUserRecordService.updSetNotLast(srappedGoodsIds);
//鎻掑叆鏂扮殑
@@ -79,7 +84,7 @@
}
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);
@@ -98,4 +103,8 @@
return true;
}
+ public static void main(String[] args) {
+ System.out.println(IdUtil.generateId());
+ System.out.println(NumberGenerator.getLongSequenceNumber() );
+ }
}
--
Gitblit v1.9.1