diff --git a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
index 199278e0..01053eb7 100644
--- a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
+++ b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
@@ -407,7 +407,7 @@ public class SalesOrderUtils {
     public static void setNewpPrice(DynamicObject dataEntitie, IFormView view) {
         DynamicObject billType = dataEntitie.getDynamicObject("yem_billtype");
         String billTypeNum = YEM.isNotEmpty(billType) ? billType.getString("number") : "";
-        if ("yem_es_salesorder_PJ".equals(billTypeNum) || "yem_es_salesorder_nmpj".equals(billTypeNum)||"yem_es_xsalesorder_pj".equals(billTypeNum) || "yem_es_xsalesorder_nmpj".equals(billTypeNum))  {
+        if ("yem_es_salesorder_PJ".equals(billTypeNum) || "yem_es_salesorder_nmpj".equals(billTypeNum) || "yem_es_xsalesorder_pj".equals(billTypeNum) || "yem_es_xsalesorder_nmpj".equals(billTypeNum)) {
             List<Long> materielId = new ArrayList();
             DynamicObjectCollection materialInfos = dataEntitie.getDynamicObjectCollection("yem_es_materialinfo");
             for (DynamicObject materialInfo : materialInfos) {
@@ -781,7 +781,6 @@ public class SalesOrderUtils {
         }
 
 
-
 //        if (qFilter != null && YEM.isNotEmpty(products)) {
 //            qFilter.and(new QFilter("yem_producttype.id", QCP.equals, products.getLong("id")));
 //        }
@@ -1155,10 +1154,10 @@ public class SalesOrderUtils {
 
     /**
      * 价格提调控为FOB 或CIF CFR时，拼接贸易术语
+     *
      * @param dataEntity
      */
-    public static void genTradeTerms(DynamicObject dataEntity, IFormView view)
-    {
+    public static void genTradeTerms(DynamicObject dataEntity, IFormView view) {
         // 价格条款
         DynamicObject priceitem = dataEntity.getDynamicObject("yem_priceitem");
         if (priceitem == null) return;
@@ -1178,6 +1177,7 @@ public class SalesOrderUtils {
 
     /**
      * 选择海关编码，携带退税率
+     *
      * @param model
      * @param rowIdx
      */
@@ -1233,9 +1233,7 @@ public class SalesOrderUtils {
             DynamicObject object = value.get(0);
             BigDecimal singlepartgiftmat = object.getBigDecimal("yem_singlepartgiftmat"); // 单台配件金额
             BigDecimal amount = qty.multiply(singlepartgiftmat);
-            if (singlepartgiftmat.compareTo(BigDecimal.ZERO)==0){
-                return;
-            }
+            if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) continue;
             DynamicObject addNew = giftEntry.addNew();
             addNew.set("yem_giveproactype", products); // 产品机型
             addNew.set("yem_qtyint", qty); // 台数