From 3e36f73770677e756826df1b5824c8e89769659c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 23 七月 2025 15:27:10 +0800
Subject: [PATCH] 盘点功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 0f6db5a..1bfc472 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
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -62,6 +63,7 @@
List<CheckDiffItem> checkDiffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
.eq(CheckDiffItem::getBarcode, barcode)
+ .eq(CheckDiffItem::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
.eq(CheckDiffItem::getOrderCode, checkCode)
);
if (checkDiffItems.isEmpty()) {
@@ -76,8 +78,6 @@
if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
-
-
return R.ok(checkDiffItems);
}
@@ -128,7 +128,7 @@
.setOrderType(OrderType.ORDER_CHECK.type)
.setSourceCode(diffItem.getOrderCode())
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type))
- .setAnfme(diffItem.getAnfme())
+ .setAnfme(diffItem.getCheckQty())
.setWorkQty(0.0)
.setBatch(diffItem.getBatch())
.setMaktx(matnr.getName())
@@ -151,7 +151,7 @@
throw new CoolException("鏂板鐩樼偣鏄庣粏淇濆瓨澶辫触锛侊紒");
}
- diffItem.setTaskItemId(taskItem.getId());
+ diffItem.setTaskItemId(taskItem.getId()).setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
if (!checkDiffItemService.updateById(diffItem)) {
throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
@@ -162,14 +162,18 @@
return R.error("鏁版嵁閿欒锛屾湭鎵惧埌宸紓鍗曟槑缁�");
}
diffItem.setCheckQty(ckDiffItem.getCheckQty()).setReason(ckDiffItem.getReason()).setMemo(ckDiffItem.getMemo());
- }
- diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
- if (!checkDiffItemService.updateById(diffItem)) {
- throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�");
+ diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
+ if (!checkDiffItemService.updateById(diffItem)) {
+ throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�");
+ }
+
+ if (!taskItemService.update(new LambdaUpdateWrapper<TaskItem>()
+ .set(TaskItem::getAnfme, diffItem.getCheckQty())
+ .eq(TaskItem::getId, diffItem.getTaskItemId()))) {
+ throw new CoolException("浠诲姟鏁伴噺淇敼澶辫触锛侊紒");
+ }
}
-// Double checkQty = Math.round((checkDiff.getCheckQty() + diffItem.getCheckQty()) * 10000) / 10000.0;
-// checkDiff.setCheckQty(checkQty);
}
List<CheckDiffItem> diffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
@@ -199,6 +203,9 @@
return R.error("鐗╂枡鐮佷负绌�");
}
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
+ if (null == matnr){
+ return R.error("鏈壘鍒扮紪鐮佸搴旂殑鏄庣粏");
+ }
CheckDiffItem checkDiffItem = new CheckDiffItem()
.setMatnrCode(matnr.getCode())
.setMaktx(matnr.getName())
--
Gitblit v1.9.1