diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java
index 72806e53..c35dde5f 100644
--- a/src/main/java/com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java
+++ b/src/main/java/com/yem/wm/es/salesorder/from/SaleOrderCreditFromEdit.java
@@ -318,6 +318,8 @@ public class SaleOrderCreditFromEdit extends AbstractBillPlugIn implements Befor
                             products = "CC";
                         } else if (number.contains("TLJ")) {
                             products = "TLJ";
+                        }else if (number.contains("WJJ")){
+                            products = "WJJ";
                         }
                     }
                     QFilter qFilter2 = new QFilter("billstatus", QCP.equals, "C");//
diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java
index d67a06b8..abd9744b 100644
--- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java
+++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java
@@ -96,7 +96,7 @@ public class SaleOrdeAddGenerateOp extends AbstractOperationServicePlugIn {
                         products = "CC";
                     } else if (number.contains("TLJ")) {
                         products = "TLJ";
-                    }else if (number.contains("WJJ")||number.contains("WJZZJ")){
+                    }else if (number.contains("WJJ")){
                         products = "WJJ";
                     }
                 }
diff --git a/src/main/java/com/yem/wm/es/shippingdetails/convert/ShippingDetialToStoraConvert.java b/src/main/java/com/yem/wm/es/shippingdetails/convert/ShippingDetialToStoraConvert.java
index 8b5ff0ce..9e0b2b51 100644
--- a/src/main/java/com/yem/wm/es/shippingdetails/convert/ShippingDetialToStoraConvert.java
+++ b/src/main/java/com/yem/wm/es/shippingdetails/convert/ShippingDetialToStoraConvert.java
@@ -124,6 +124,7 @@ public class ShippingDetialToStoraConvert extends AbstractConvertPlugIn
                     // 信保本位币金额
                     addNew.set("yem_creditamtbase", storageAmount.multiply(exrate));
                     //应收款金额1（本位币）
+                    addNew.set("yem_paymentamt1_cd", bigDecimal);
                     addNew.set("yem_paymentamt1_cdbase", storageAmount.multiply(exrate));
 
                     if ("USD".equals(currency)) {
@@ -153,6 +154,7 @@ public class ShippingDetialToStoraConvert extends AbstractConvertPlugIn
 
                     // 保险费本位币金额
                     addNew.set("yem_insuranceamtbas_cd", insuranceamt.multiply(exrate));
+                    addNew.set("yem_amountowed", bigDecimal);
 //                    //SWIFT CODE
 //                    addNew.set("yem_swiftcode", dynamicObject.get("yem_swiftcode"));
                 }