From 9c2df944ffcd3a60312ae179d347f16f2c36a0ea Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期三, 19 十一月 2025 13:13:14 +0800
Subject: [PATCH] 功能優化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 020eae3..2290ddf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -271,7 +271,7 @@
}
Double summed = items.stream().mapToDouble(TaskItem::getAnfme).sum();
//鍔犱笂鍘嗗彶鎷ｆ枡鏁伴噺
- Double pickQty = Math.round((orderItem.getQty() + summed) * 10000) / 10000.0;
+ Double pickQty = Math.round((orderItem.getQty() + summed) * 100) / 100.0;
if (pickQty.compareTo(orderItem.getAnfme()) > 0.0) {
throw new CoolException("鎾鏁伴噺涓嶈兘瓒呭嚭璁㈠崟闇�姹傛暟閲�");
}
@@ -304,7 +304,7 @@
List<StockItem> stockItems = new ArrayList<>();
items.forEach(taskItem -> {
- taskItem.setQty(taskItem.getAnfme());
+ taskItem.setQty(taskItem.getAnfme()).setOrderId(order.getId()).setOrderItemId(orderItem.getId());
if (!taskItemService.updateById(taskItem)) {
throw new CoolException("鐘舵�佸畬鎴愬け璐ワ紒锛�");
}
@@ -326,20 +326,15 @@
throw new CoolException("璁㈠崟鏁伴噺鏇存柊澶辫触锛侊紒");
}
//妫�鏌ュ崟鎹槸鍚﹀畬鎴�
- if (order.getAnfme().compareTo(order.getQty()) == 0) {
- order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
- }
- }
+// if (order.getAnfme().compareTo(order.getQty()) == 0) {
+// order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+// if (!asnOrderService.updateById(order)) {
+// throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
+// }
+// }
return R.ok();
}
-
- private void saveOrderToStock(Order order) {
-
-
- }
/**
* @author Ryan
@@ -447,11 +442,17 @@
//// }
// }
- task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
- if (!taskService.updateById(task)) {
- throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+ try {
+ taskService.pickOrCheckTask(task.getId(), "");
+ } catch (Exception e) {
+ e.printStackTrace();
}
+// task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
+// if (!taskService.updateById(task)) {
+// throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+// }
+
return R.ok();
}
--
Gitblit v1.9.1