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 d5285ea4..e01eac3b 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
@@ -608,10 +608,11 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
     private void extracted() {
 
         String value = ((DynamicObject) this.getModel().getValue("yem_billtype")).getString("number");
+        DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo");
+        Boolean tere = false;
         if ("yem_shippingdetails_zj".equals(value) || "yem_shippingdetails_nmzj".equals(value)) {
             String yemIsdismantlecar = (String) this.getModel().getValue("yem_isdismantlecar");
             if ("B".equals(yemIsdismantlecar)) {
-                DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo");
                 for (int i = 0; i < yemEsMaterialinfo.size(); i++) {
                     DynamicObject dynamicObject = yemEsMaterialinfo.get(i);
                     DynamicObject yemProductmodel = dynamicObject.getDynamicObject("yem_productmodel");
@@ -622,9 +623,8 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
                                     , new QFilter[]{new QFilter("id", QCP.equals, yemProducts.getLong("id"))});
                             DynamicObject group = loadsingle.getDynamicObject("group");
                             String yemVechpowertype = loadsingle.getString("yem_vechpowertype");
-                            if (group != null&& yemVechpowertype.equals("燃油")) {
+                            if (group != null && yemVechpowertype.equals("燃油")) {
                                 String string = group.getString("number");
-                                Boolean tere = false;
                                 if ("ZZJ-7T".equals(string)) {
                                     tere = true;
                                 } else if ("ZZJ-6T".equals(string)) {
@@ -634,14 +634,26 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
                                 } else if ("ZZJ-4T".equals(string)) {
                                     tere = true;
                                 }
-                                if (tere) {
-                                    this.getModel().setValue("yem_remarks", "更换锁紧螺母",i);
-                                }else {
-                                    this.getModel().setValue("yem_remarks", "",i);
-                                }
                             }
                         }
                     }
+                    if (tere) {
+                        this.getModel().setValue("yem_remarks", "更换锁紧螺母", i);
+                    } else {
+                        this.getModel().setValue("yem_remarks", "", i);
+                    }
+                }
+            }else {
+                if (!yemEsMaterialinfo.isEmpty()) {
+                    for (int i = 0; i < yemEsMaterialinfo.size(); i++) {
+                        this.getModel().setValue("yem_remarks", "", i);
+                    }
+                }
+            }
+        } else {
+            if (!yemEsMaterialinfo.isEmpty()) {
+                for (int i = 0; i < yemEsMaterialinfo.size(); i++) {
+                    this.getModel().setValue("yem_remarks", "", i);
                 }
             }
         }