From 7b983df0c9fc8b1eb99429dd37699443c62e1d9d Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 02 二月 2023 18:35:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 319c1a0..3f58d01 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -94,7 +94,9 @@
orderDetl.setQty(orderDetl.getAnfme());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
- List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+// List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+ List<OrderDto> orderDtoList = new ArrayList<>();
+ orderDtoList.add(new OrderDto(wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getAnfme()));
for (OrderDto one : orderDtoList) {
if (one.getOrderNo().equals(orderNo)) {
orderDetl.setAnfme(one.getAnfme());
--
Gitblit v1.9.1