From 25f91c2eb2e458ee065e787bd547f8fe0625e918 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 6797225..d74fdae 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
@@ -107,7 +107,11 @@
CheckDiffItem diffItem = new CheckDiffItem();
if (Objects.isNull(ckDiffItem.getId())) {
BeanUtils.copyProperties(ckDiffItem, diffItem);
- diffItem.setCheckId(params.getCheckId());
+ diffItem.setCheckId(params.getCheckId())
+ .setOrderCode(checkDiff.getOrderCode())
+ .setTaskId(task.getId())
+ .setBarcode(task.getBarcode())
+ .setAnfme(ckDiffItem.getCheckQty());
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()));
if (Objects.isNull(matnr)) {
@@ -122,6 +126,7 @@
BeanUtils.copyProperties(diffItem, diffItem);
taskItem.setTaskId(task.getId())
.setOrderType(OrderType.ORDER_CHECK.type)
+ .setSourceCode(diffItem.getOrderCode())
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type))
.setAnfme(diffItem.getAnfme())
.setWorkQty(0.0)
@@ -145,6 +150,12 @@
if (!taskItemService.save(taskItem)) {
throw new CoolException("鏂板鐩樼偣鏄庣粏淇濆瓨澶辫触锛侊紒");
}
+
+ diffItem.setTaskItemId(taskItem.getId());
+
+ if (!checkDiffItemService.updateById(diffItem)) {
+ throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
+ }
} else {
diffItem = checkDiffItemService.getById(ckDiffItem.getId());
if (null == diffItem) {
--
Gitblit v1.9.1