diff --git a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
index 57d34c2f..5c4ad8bd 100644
--- a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
+++ b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
@@ -492,7 +492,7 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
         Map<Long, BigDecimal> map = new HashMap<>();
         for (int rowIndex : rowIndexs) {
             DynamicObject yemProductmodel = (DynamicObject) this.getModel().getValue("yem_productmodel", rowIndex);
-            BigDecimal yemQty = (BigDecimal) this.getModel().getValue("yem_qty",rowIndex);
+            BigDecimal yemQty = (BigDecimal) this.getModel().getValue("yem_qty", rowIndex);
             if (yemProductmodel != null) {
                 long aLong = yemProductmodel.getDynamicObject("yem_products").getLong("id");
                 map.merge(aLong, yemQty, (a, b) -> b.add(a));
@@ -532,29 +532,34 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
             int currentRowIndex = this.getModel().getEntryCurrentRowIndex("yem_es_materialinfo");
             String yemsourcebilltype = (String) this.getModel().getValue("yem_sourcebilltype");
             if ("yem_es_salesorder".equals(yemsourcebilltype)) {
-                String yemsourcebillno = (String) this.getModel().getValue("yem_sourcebillno");
-                if (YEM.isNotEmpty(yemsourcebillno)) {
-                    DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", "", new QFilter[]{
-                            new QFilter("billno", QCP.equals, yemsourcebillno),
-                            new QFilter("billstatus", QCP.equals, "C")
-                    });
-                    if (dynamicObject != null) {
-                        dynamicObject = BusinessDataServiceHelper.loadSingle(dynamicObject.getPkValue(), dynamicObject.getDynamicObjectType().getName());
-                        DynamicObjectCollection dynamicObjectCollection = dynamicObject.getDynamicObjectCollection("yem_es_materialinfo");
-                        if (dynamicObjectCollection != null && dynamicObjectCollection.size() > 0) {
-                            DynamicObject dynamicObject1 = dynamicObjectCollection.get(currentRowIndex);
-                            if (dynamicObject1 != null) {
-                                DynamicObjectCollection yem_es_salesorder_z = dynamicObject1.getDynamicObjectCollection("yem_es_salesorder_z");
-                                Map<String, Object> datas = new HashMap();
-                                List<DynamicObject> zjNumberList = new ArrayList();
-                                for (DynamicObject temp : yem_es_salesorder_z) {
-                                    boolean yemIfdelivered = temp.getBoolean("yem_ifdelivered");
-                                    if (!yemIfdelivered) {
-                                        zjNumberList.add(temp);
+                DynamicObjectCollection dynamicObjectCollection = this.getModel().getEntryEntity("yem_es_materialinfo");
+                if (!dynamicObjectCollection.isEmpty()) {
+                    DynamicObject yemEsMaterialinfo = dynamicObjectCollection.get(currentRowIndex);
+                    long yemCoreentryid = yemEsMaterialinfo.getLong("yem_coreentryid");
+                    String yemsourcebillno = (String) this.getModel().getValue("yem_sourcebillno");
+                    if (YEM.isNotEmpty(yemsourcebillno)) {
+                        DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", "", new QFilter[]{
+                                new QFilter("billno", QCP.equals, yemsourcebillno),
+                                new QFilter("billstatus", QCP.equals, "C")
+                        });
+                        if (dynamicObject != null) {
+                            dynamicObject = BusinessDataServiceHelper.loadSingle(dynamicObject.getPkValue(), dynamicObject.getDynamicObjectType().getName());
+                            DynamicObjectCollection dynamicObject1 = dynamicObject.getDynamicObjectCollection("yem_es_materialinfo");
+                            for (DynamicObject object : dynamicObject1) {
+                                long aLong = object.getLong("id");
+                                if (yemCoreentryid == aLong) {
+                                    DynamicObjectCollection yem_es_salesorder_z = object.getDynamicObjectCollection("yem_es_salesorder_z");
+                                    Map<String, Object> datas = new HashMap();
+                                    List<DynamicObject> zjNumberList = new ArrayList();
+                                    for (DynamicObject temp : yem_es_salesorder_z) {
+                                        boolean yemIfdelivered = temp.getBoolean("yem_ifdelivered");
+                                        if (!yemIfdelivered) {
+                                            zjNumberList.add(temp);
+                                        }
                                     }
+                                    datas.put("yem_vehicleno", zjNumberList);
+                                    parameter.setCustomParams(datas);
                                 }
-                                datas.put("yem_vehicleno", zjNumberList);
-                                parameter.setCustomParams(datas);
                             }
                         }
                     }
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 76a2336a..f127b9f2 100644
--- a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java
+++ b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java
@@ -129,6 +129,9 @@ 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")));