From 1b30538f3573bbc7ac5db3340f41b279e9e29e36 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 28 二月 2024 18:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 560ab43..d20eb46 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -117,7 +117,7 @@
if (object.get("deliveryId") != null) {
deliveryId = object.get("deliveryId").toString();
}
- Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
+ Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Delivery.class);
List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
//鏌ヨ鍙戣揣鍗曟槸鍚﹀瓨鍦�
Integer deliveryConut = deliveryMapper.getDeliveryConut(deliveryId);
--
Gitblit v1.8.0