From 11514b301466eb7598073d0126c6d9781daaa3ba Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 09 三月 2026 14:00:40 +0800
Subject: [PATCH] 盘点流程
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 8c13859..e8a8a26 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -5,7 +5,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
+import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;
@@ -92,16 +92,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R saveCheckDiff(SaveCheckDiffParams params, Long loginUserId) {
+ if (params.getCheckDiffItems() == null || params.getCheckDiffItems().isEmpty()) {
+ throw new CoolException("鐩樼偣鏄庣粏涓嶈兘涓虹┖");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getContainer()).last("limit 1"));
+ if (null == task) {
+ throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌瀹瑰櫒鐮佸搴旂洏鐐逛换鍔�");
+ }
+
CheckDiff checkDiff = checkDiffService.getById(params.getCheckId());
if (null == checkDiff) {
return R.error("鏈壘鍒扮洏鐐瑰樊寮傚崟");
}
if (checkDiff.getExceStatus().equals(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)) {
return R.error("璇ョ洏鐐瑰崟宸插畬鎴�");
- }
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getContainer()));
- if (null == task) {
- throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌瀹瑰櫒鐮佸搴旂洏鐐逛换鍔�");
}
for (CheckDiffItem ckDiffItem : params.getCheckDiffItems()) {
CheckDiffItem diffItem = new CheckDiffItem();
@@ -113,7 +117,7 @@
.setBarcode(task.getBarcode())
.setAnfme(ckDiffItem.getCheckQty());
- Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()));
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()).last("limit 1"));
if (Objects.isNull(matnr)) {
throw new CoolException("鍗曟嵁鐗╂枡鍚嶇О涓嶅瓨鍦紒锛�");
}
@@ -145,6 +149,7 @@
.setMemo("涓嶅湪搴撴槑缁嗭紝鐩樻紡鏂板")
.setUpdateTime(new Date())
.setId(null)
+ .setSplrBatch(ckDiffItem.getBatch())
//鐩樼偣鍗旾D
.setOrderId(checkDiff.getOrderId());
if (!taskItemService.save(taskItem)) {
@@ -202,7 +207,7 @@
if (Cools.isEmpty(matnrCode)){
return R.error("鐗╂枡鐮佷负绌�");
}
- Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode).last("limit 1"));
if (null == matnr){
return R.error("鏈壘鍒扮紪鐮佸搴旂殑鏄庣粏");
}
@@ -219,7 +224,7 @@
public R getCheckTaskItemList2(String barcode) {
LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Task::getBarcode, barcode);
- Task task = taskService.getOne(lambdaQueryWrapper);
+ Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
@@ -231,7 +236,7 @@
throw new CoolException("鏈壘鍒拌瀹瑰櫒鐮佸搴旂殑浠诲姟鏄庣粏");
}
String sourceCode = taskItems.stream().findFirst().map(TaskItem::getSourceCode).orElse(null);
- CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode));
+ CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode).last("limit 1"));
if (null == checkDiff) {
return R.error("鏈壘鍒扮洏鐐瑰樊寮傚崟");
}
@@ -243,7 +248,6 @@
if (checkDiffItems.isEmpty()) {
throw new CoolException("姝ゆ潯鐮佷笉鍦ㄥ綋鍓嶇洏鐐瑰崟涓�");
}
-
- return R.ok(Cools.add("checkDiffItems",checkDiffItems).add("checkDiff",checkDiff));
+ return R.ok(Cools.add("checkDiffItems", checkDiffItems).add("checkDiff", checkDiff));
}
}
--
Gitblit v1.9.1