diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSaveOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSaveOp.java
index 2621ce0c..e0f85e1b 100644
--- a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSaveOp.java
+++ b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSaveOp.java
@@ -26,12 +26,6 @@ import static com.yem.wm.syn.cmmp.addnew.OrderProReqBillWMI.getDownList;
  * 保存时贸易术语赋值
  */
 public class SalesOrderSaveOp extends AbstractOperationServicePlugIn {
-    @Override
-    public void onPreparePropertys(PreparePropertysEventArgs e) {
-        super.onPreparePropertys(e);
-        List<String> fieldKeys = e.getFieldKeys();
-        fieldKeys.addAll(this.billEntityType.getAllFields().keySet());
-    }
 
     @Override
     public void endOperationTransaction(EndOperationTransactionArgs e) {
@@ -53,9 +47,5 @@ public class SalesOrderSaveOp extends AbstractOperationServicePlugIn {
             }
         }
     }
-    @Override
-    public void onAddValidators(AddValidatorsEventArgs e) {
-        super.onAddValidators(e);
-        e.addValidator(new SalesOrderSaveValidator());
-    }
+
 }
diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java
index 757c1979..0edcfc1a 100644
--- a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java
+++ b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java
@@ -8,6 +8,7 @@ package com.yem.wm.es.salesorder.op;/*
 import com.yem.wm.es.salesorder.utils.SalesOrderUtils;
 import com.yem.wm.es.salesorder.validator.NewSalesOrderSubmitAnnexValidator;
 import com.yem.wm.es.salesorder.validator.NewSalesOrderSubmitValidator;
+import com.yem.wm.es.salesorder.validator.SalesOrderSaveValidator;
 import com.yem.wm.es.salesorder.validator.SalesOrderSubmitValidator;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -33,53 +34,7 @@ public class SalesOrderSubmitOp extends AbstractOperationServicePlugIn {
     public void onPreparePropertys(PreparePropertysEventArgs e) {
         super.onPreparePropertys(e);
         List<String> fieldKeys = e.getFieldKeys();
-        fieldKeys.add("yem_billtype");
-        fieldKeys.add("yem_materialclass");
-        fieldKeys.add("yem_fundusetype");
-        fieldKeys.add("yem_fundpoolamt");
-        fieldKeys.add("yem_accfunddetail");
-        fieldKeys.add("yem_usedebcrednoteno");
-        fieldKeys.add("yem_orderuseamt");
-        fieldKeys.add("yem_onecarcom");
-        fieldKeys.add("yem_es_materialinfo");
-        fieldKeys.add("yem_intauditbusano");
-        fieldKeys.add("yem_commissionamt");
-        e.getFieldKeys().add("yem_materiel");
-        fieldKeys.add("yem_issinosurecon");
-        fieldKeys.add("yem_intauditbusaid");
-        fieldKeys.add("yem_giftamountsum");
-        fieldKeys.add("yem_isgiftgiveparts");
-        fieldKeys.add("yem_issinosure");
-        fieldKeys.add("yem_offeramount");
-        fieldKeys.add("yem_rapamt");
-        fieldKeys.add("yem_giftamountsum");
-        fieldKeys.add("yem_newprice");
-        fieldKeys.add("yem_newsalediffprice");
-        fieldKeys.add("yem_safobprice");
-        fieldKeys.add("yem_exrate");
-        fieldKeys.add("org");
-        fieldKeys.add("yem_customer");
-        fieldKeys.add("yem_customer");
-        fieldKeys.add("yem_bd_products");
-        fieldKeys.add("yem_bd_products");
-        fieldKeys.add("yem_debitamount");
-        fieldKeys.add("yem_contremark");
-        fieldKeys.add("yem_exrate");
-        fieldKeys.add("yem_fundusetype");
-        fieldKeys.add("yem_accfunddetail");
-        fieldKeys.add("yem_debcredtype");
-        fieldKeys.add("yem_usedebcrednoteno");
-        fieldKeys.add("yem_disamt");
-        fieldKeys.add("yem_color");
-        fieldKeys.add("yem_marketraiseprice");
-        fieldKeys.add("yem_currency");
-        fieldKeys.add("yem_attsum");
-        fieldKeys.add("yem_cnperson");
-        fieldKeys.add("yem_suminsured");
-        fieldKeys.add("yem_internationalrate");
-        fieldKeys.add("yem_es_salescontrac_s");
-        fieldKeys.add("yem_es_salescontrac_s.yem_issinosure");
-        fieldKeys.add("yem_es_salescontrac_s.yem_rapstyle");
+        fieldKeys.addAll(this.billEntityType.getAllFields().keySet());
     }
 
     @Override
@@ -88,6 +43,7 @@ public class SalesOrderSubmitOp extends AbstractOperationServicePlugIn {
         e.addValidator(new SalesOrderSubmitValidator());
         e.addValidator(new NewSalesOrderSubmitValidator());
         e.addValidator(new NewSalesOrderSubmitAnnexValidator());
+        e.addValidator(new SalesOrderSaveValidator());
     }
 
     @Override
@@ -127,8 +83,8 @@ public class SalesOrderSubmitOp extends AbstractOperationServicePlugIn {
                     String yemConfigurtypeen = yemMulticon.getString("yem_configurtypeen");
                     list.add(yemConfigurtypeen);
                 }
-                String mergedString = String.join(";"+"\n", list);
-                yemEsMAterialin.set("yem_optional",mergedString);
+                String mergedString = String.join(";" + "\n", list);
+                yemEsMAterialin.set("yem_optional", mergedString);
                 SaveServiceHelper.update(dynamicObject);
             }
         }