From cad671a443f34b411ed4a69cb94490b1121102ce Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 04 三月 2025 17:02:56 +0800
Subject: [PATCH] 优化版图显示、钢化模拟计算保存、结果显示
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index 74f0ab7..a25dfff 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -207,7 +207,8 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), OrderDetail.class);
if (!orderDetaillist.isEmpty()){
- if(!Objects.equals(deliveryDetailLogic(orderDetaillist, savePoint, userName), "true")){
+
+ if(!Objects.equals(deliveryDetailLogic(orderDetaillist, savePoint, userName), "true")) {
return deliveryDetailLogic(orderDetaillist, savePoint, userName);
}
}
@@ -828,7 +829,7 @@
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
//鍒ゆ柇璁㈠崟鏄惁鍏ㄩ儴鍙戣揣
- if (orderNumberdsum == orderDetail.getWarehouseNum()) {
+ if (Objects.equals(orderNumberdsum, orderDetail.getWarehouseNum())) {
//if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
//淇敼璁㈠崟琛ㄥ彂璐х姸鎬�
finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
--
Gitblit v1.8.0