From dcae969ee04f67b6dc46f3ca061116f44558307a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 24 六月 2025 08:27:36 +0800
Subject: [PATCH] #订单导入去重
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 7f2c52e..7322481 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2006,6 +2006,15 @@
materialDetail.setRollNo(wrkDetl.getModel());
materialDetail.setBoxNo(wrkDetl.getUnit());
materialDetail.setSpecs(wrkDetl.getMatnr());
+ materialDetail.setBoxType(wrkDetl.getColor());
+ materialDetail.setCoreType(wrkDetl.getManu());
+ materialDetail.setWidth(wrkDetl.getSku());
+ materialDetail.setThickness(wrkDetl.getItemNum());
+ materialDetail.setWeight(wrkDetl.getWeight());
+ materialDetail.setLength(wrkDetl.getLength());
+ materialDetail.setVolume(wrkDetl.getVolume());
+ materialDetail.setCustomerName(wrkDetl.getSupp());
+ materialDetail.setMemo(wrkDetl.getMemo());
material.setBoxPos(wrkDetl.getOrigin()); // 鎵樼洏涓婃湪绠变綅缃�
materialDetailList.add(materialDetail);
}
@@ -2015,14 +2024,15 @@
Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()));
if (order != null) {
material.setOrderNo(order.getOrderNo());
- material.setMemo(order.getMemo());
- material.setCustomerName(order.getCstmrName());
+// material.setMemo(order.getMemo());
+// material.setCustomerName(order.getCstmrName());
List<OrderStatisticsDto> unfulfilledOrders = orderMapper.getUnfulfilledOrders(order.getOrderNo());
if (unfulfilledOrders.size() == 1) {
OrderStatisticsDto orderStatisticsDto = unfulfilledOrders.get(0);
material.setSum(orderStatisticsDto.getSum());
material.setToShipQuantity(orderStatisticsDto.getToShipQuantity());
material.setWorkQuantity(orderStatisticsDto.getWorkQuantity());
+ material.setCompleteQuantity(orderStatisticsDto.getCompletedQuantity());
}
}
}
--
Gitblit v1.9.1