From 0234a1df02c80f7d23dbf358a628850db9d2394e Mon Sep 17 00:00:00 2001
From: ljw <ljw@yunemao.com>
Date: Fri, 13 Dec 2024 17:15:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E8=AE=A2=E8=88=B1=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=E5=90=8C=E6=AD=A5EAS=E3=80=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/syn/eas/YemDelivernoticeService.java   | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java
index 8b19efef..c1b9ab3f 100644
--- a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java
+++ b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java
@@ -50,7 +50,7 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn {
                 dataEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), dataEntity.getDynamicObjectType().getName());
                 DynamicObject yem_billtype = dataEntity.getDynamicObject("yem_billtype");
                 String yemSynchronizeeas = dataEntity.getString("yem_synchronizeeas");
-                if ("B".equals(yemSynchronizeeas)){
+                if ("B".equals(yemSynchronizeeas)) {
                     list.add(selectedRow);
                     continue;
                 }
@@ -129,12 +129,20 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn {
             //单据编号
             json.put("number", dataEntitie.getString("billno"));
             //送货客户
-//            if (dataEntitie.getString("yem_sale_type").equals("B")) {
-//
-//            }
-            DynamicObject yemCustomer = dataEntitie.getDynamicObject("yem_customer1");
-            if (yemCustomer != null) {
-                json.put("customer", setJson("number", yemCustomer.getString("number")));
+            if (dataEntitie.getString("yem_sale_type").equals("B")) {
+                DynamicObject yemCustomer = dataEntitie.getDynamicObject("yem_actualcustomer");
+                if (yemCustomer != null) {
+                    json.put("customer", setJson("number", yemCustomer.getString("number")));
+                    json.put("receiveinfo",  dataEntitie.getString("yem_customername"));
+                    json.put("paymentcustomer", setJson("number", yemCustomer.getString("number")));
+                    json.put("ordercustomer", setJson("number", yemCustomer.getString("number")));
+                    json.put("balancecustomer", setJson("number", yemCustomer.getString("number")));
+                }
+            } else {
+                DynamicObject yemCustomer = dataEntitie.getDynamicObject("yem_customer1");
+                if (yemCustomer != null) {
+                    json.put("customer", setJson("number", yemCustomer.getString("number")));
+                }
             }
             //币别
             DynamicObject yemCurrency = dataEntitie.getDynamicObject("yem_currency");
@@ -276,6 +284,11 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn {
             if (yemWarehouse != null) {
                 json.put("warehouse", setJson("number", yemWarehouse.getString("number")));
             }
+            //送货客户
+            if (dataEntitie.getString("yem_sale_type").equals("B")) {
+                json.put("terminalamount", materialentry.getString("yem_endamount"));
+                json.put("terminalprice", materialentry.getString("yem_endprice"));
+            }
             //库位
             DynamicObject yemLocation = materialentry.getDynamicObject("yem_location");
             if (yemLocation != null) {