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) {