diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
index 1544ae62..c58dd62b 100644
--- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
+++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
@@ -99,7 +99,8 @@ public class ClientUtils {
             }
             //客户需求单整机 -整机分录行
 //            if (("yem_im_clientdeman_zj".equals(yem_billtype) || "yem_im_inclientdeman_zj".equals(yem_billtype) || ("yem_es_salesorder_ZJ".equals(yem_billtype)) || "yem_es_salesorder_nmzj".equals(yem_billtype)) && "Z".equals(businesssort)) {
-            if (("yem_im_clientdeman_zj".equals(yem_billtype) || "yem_im_inclientdeman_zj".equals(yem_billtype) || ("yem_es_salesorder_ZJ".equals(yem_billtype)) || "yem_es_salesorder_nmzj".equals(yem_billtype) || "yem_es_xsalesorder_zj".equals(yem_billtype) | "yem_es_xsalesorder_nmzj".equals(yem_billtype)) && "Z".equals(businesssort)) {
+            if (("yem_im_clientdeman_zj".equals(yem_billtype) || "yem_im_inclientdeman_zj".equals(yem_billtype) || ("yem_es_salesorder_ZJ".equals(yem_billtype))
+                    || "yem_es_salesorder_nmzj".equals(yem_billtype) || "yem_es_xsalesorder_zj".equals(yem_billtype) | "yem_es_xsalesorder_nmzj".equals(yem_billtype)) && "Z".equals(businesssort)) {
                 list.add(new QFilter("yem_bd_products.id", QCP.equals, products));
                 list.add(new QFilter("billstatus", QCP.equals, "C"));
                 list.add(new QFilter("yem_billtype.number", QCP.equals, "yem_pricelibrary_ZJ"));
@@ -376,13 +377,12 @@ public class ClientUtils {
                     for (DynamicObject dm : yem_accessory) {
                         long yem_materials = dm.getLong("yem_material.id");//价格库物料内码
                         String yemBillstatusfield = dm.getString("yem_billstatusfield");
-
                         if (materialId == yem_materials) {
                             pjDatas.add(dm);
                             if (dm != null) {
-                                models.setValue("yem_fobprice", dm.getBigDecimal("yem_standsalesprice"), rowInfo);
                                 String yembilltype = models.getDataEntityType().getName();
                                 if ("B".equals(yemBillstatusfield)) {
+                                    models.setValue("yem_fobprice", dm.getBigDecimal("yem_standsalesprice"), rowInfo);
                                     if ("yem_es_salesorder".equals(yembilltype) || "yem_es_xsalesorder".equals(yembilltype)) {
                                         models.setValue("yem_exwrmbprice", dm.getBigDecimal("yem_standsalesprice"), rowInfo);
                                     }