diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml
index 7624e376..dd6a772d 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml
@@ -2,7 +2,7 @@
 server:
   tomcat:
     uri-encoding: UTF-8 #tomcat编码
-  port: 50000 #tomcat端口
+  port: 30000 #tomcat端口
 
 spring:
   devtools: #spring开发者工具模块
@@ -114,7 +114,7 @@ springdoc:
 
 config:
   kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
-  ApiDomain: http://127.0.0.1:50000 #后端域名(文档预览中使用)
+  ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用)
   FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用)
   AppDomain: http://127.0.0.1:8080 #app/h5端域名配置(文档预览中使用)
   # ===================== 是否开启测试环境 =====================
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
index 3cf8b40d..f0c2a9c8 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
@@ -848,19 +848,19 @@
             CASE
                 b.payment_method
                 WHEN '1' THEN
-                    '现金'
+                    'A'
                 WHEN '2' THEN
-                    '现金'
+                    'A'
                 WHEN '3' THEN
-                    '现金'
+                    'A'
                 WHEN '4' THEN
-                    '承兑'
+                    'B'
                 WHEN '5' THEN
-                    '现金'
+                    'A'
                 WHEN '6' THEN
-                    '现金'
+                    'A'
                 WHEN '7' THEN
-                    '现金'
+                    'A'
                 END AS PAY_MTH,
                 g.yunguan_value AS TRANS_TYPE,
             CASE
@@ -887,7 +887,8 @@
             'N' as ESB_STATUS,
             null as ESB_DTM,
             '' as ESB_MESSAGE,
-            count(h.id) as LINE_SUM
+            count(h.id) as LINE_SUM,
+            IF ( LOCATE( '贸易', i.NAME ) > 0, '11', '50' ) AS ORD_TY
         FROM
             jg_business_order a
                 LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id
@@ -904,6 +905,8 @@
                 AND g.f_delete_mark IS NULL AND g.type_id = '565504934695425285'
                 LEFT JOIN jg_business_order_product_relational h ON h.business_order_id = a.id
                 AND h.f_delete_mark IS NULL
+                LEFT JOIN jg_business_line i ON a.business_line_id = i.id
+                AND i.f_delete_mark IS NULL
             WHERE a.f_delete_mark is null and a.id = #{id}
     </select>
 
@@ -912,7 +915,7 @@
             b.id AS ID,
             c.f_en_code AS COMP_CD,
             a.CODE AS ORD_NO,
-            b.ord_ln as ORD_LN,
+            LPAD(b.ord_ln,2,0) as ORD_LN,
             d.CODE AS ITEM_CD,
             d.NAME AS ITEM_NM,
             d.spec AS SPEC_TYPE,
@@ -970,7 +973,7 @@
             c.f_en_code AS COMP_CD,
             f.kucun_org_code AS ORG_ID,
             f.kucun_org_name AS ORG_NM,
-            d.f_id as DEPARTMENT_CD,
+            d.f_en_code as DEPARTMENT_CD,
             d.f_en_code AS ADD_DEPT_CODE,
             d.f_full_name AS ADD_DEPT_NAME,
             a.CODE AS ORD_NO,
@@ -1012,19 +1015,19 @@
             CASE
                 b.payment_method
                 WHEN '1' THEN
-                    '现金'
+                    'A'
                 WHEN '2' THEN
-                    '现金'
+                    'A'
                 WHEN '3' THEN
-                    '现金'
+                    'A'
                 WHEN '4' THEN
-                    '承兑'
+                    'B'
                 WHEN '5' THEN
-                    '现金'
+                    'A'
                 WHEN '6' THEN
-                    '现金'
+                    'A'
                 WHEN '7' THEN
-                    '现金'
+                    'A'
                 END AS PAY_MTH,
             f.total_amount AS CONTR_PRICE,
             g.full_address AS FROM_PLACE,
@@ -1042,8 +1045,12 @@
             a.f_creator_time as ORD_REG_DTM,
             e.f_real_name AS CREATE_EMP_ID,
             a.f_creator_time as CREATE_DTM,
+            j.f_real_name as MODIFY_EMP_ID,
+            a.f_last_modify_time as MODIFY_DTM,
+            a.f_last_modify_time as ORD_CONF_DTM,
             '0' as CANCLE_YN,
-            IF ( LOCATE( '贸易', h.NAME ) > 0, '11', '50' ) AS ORD_TY
+            IF ( LOCATE( '贸易', h.NAME ) > 0, '11', '50' ) AS ORD_TY,
+            count(i.id) as LINE_SUM
         FROM
             jg_business_order a
                 LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id
@@ -1060,6 +1067,10 @@
                 AND g.f_delete_mark IS NULL
                 LEFT JOIN jg_business_line h ON a.business_line_id = h.id
                 AND h.f_delete_mark IS NULL
+                LEFT JOIN jg_business_order_product_relational i ON i.business_order_id = a.id
+                AND i.f_delete_mark IS NULL
+                LEFT JOIN base_user j ON a.f_last_modify_user_id = j.f_id
+                AND j.f_delete_mark is null
         WHERE a.f_delete_mark IS NULL AND a.id = #{id}
     </select>
 
@@ -1067,9 +1078,9 @@
         SELECT
             b.id AS ID,
             c.f_en_code AS COMP_CD,
-            g.f_id as DEPARTMENT_CD,
+            g.f_en_code as DEPARTMENT_CD,
             a.CODE AS ORD_NO,
-            b.ord_ln as ORD_LN,
+            LPAD(b.ord_ln,3,0) as LINE_NO,
             '' as CONTR_LINE_ID,
             'B' AS ORD_STS,
             d.CODE AS ITEM_CD,
@@ -1080,8 +1091,8 @@
             b.business_price AS ORD_PRICE,
             b.tax_count AS TOT_AMOUNT,
             b.tax AS TAX_RATE_CODE,
-            f.tax_rate_code as TAX_RATE,
-            (IFNULL(b.tax_count,0) - IFNULL(b.not_tax_count,0)) as TAX_AMOUNT
+            CONCAT('VAT_OUT_',b.tax) as TAX_RATE,
+            (IFNULL(CAST(b.tax_count AS DECIMAL(32,2)),0) - IFNULL(CAST(b.not_tax_count AS DECIMAL(32,2)),0)) as TAX_AMOUNT,
             b.not_tax_price AS TAX_PRICE,
             b.not_tax_count AS AMOUNT,
             f.delv_tol_max as DELV_TOL_MAX,
@@ -1111,7 +1122,7 @@
                 AND f.f_delete_mark IS NULL
                 LEFT JOIN base_organize g ON a.department_id = g.f_id
                 AND g.f_delete_mark IS NULL
-                LEFT JOIN base_user h ON a.f_creator_user_id = h.id AND h.f_delete_mark is null
+                LEFT JOIN base_user h ON a.f_creator_user_id = h.f_id AND h.f_delete_mark is null
         WHERE a.f_delete_mark IS NULL AND a.id = #{id}
     </select>
 
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
index e9d60587..d63d8983 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
@@ -120,23 +120,23 @@
     <select id="saleOutBoundByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
         SELECT
             a.id AS OUT_ID,
-            e.f_id as COMP_ID,
-            e.f_en_code AS COMP_CD,
+            e.f_en_code AS COMP_ID,
             f.f_en_code AS DEPT_ID,
             a.document_no AS PROD_ZL,
             aa.order_line as CK_ORDER,
             IF(a.warehousing_outbound_type = 1,c.code,m.code) as SAL_ORDER,
-            d.CODE AS CUS_ID,
-            d.NAME AS CUS_NAME,
-            i.NAME AS STORE_ID,
+            IF(a.warehousing_outbound_type = 1,d.code,q.code) as CUS_ID,
+            IF(a.warehousing_outbound_type = 1,d.name,q.name) as CUS_NAME,
+            i.cargo_name AS STORE_ID,
             a.warehousing_time as OUT_DTM,
             a.remark as REMARKS,
             j.CODE AS MAT_ID,
             j.NAME AS MAT_NAME,
-            j.spec AS SPECIFICATION,
+            aa.spec AS SPECIFICATION,
             aa.outbound_unit AS UNIT,
             aa.outbound_number AS OUT_QUANTITY,
             '1' as OUT_FLAG,
+            s.contract_no as contract_no,
             g.f_real_name as CREATE_EMP_ID,
             a.f_creator_time as CREATE_DTM,
             k.f_real_name as MODIFY_EMP_ID,
@@ -149,25 +149,29 @@
             'N' as ESB_STATUS,
             null as ESB_DTM,
             '' as ESB_MESSAGE,
-            IF(a.warehousing_outbound_type = 1,n.ord_ln,o.ord_ln) as SAL_LINE,
+            IF(a.warehousing_outbound_type = 1,LPAD(n.ord_ln,3,0),LPAD(o.ord_ln,3,0)) as SAL_LINE,
             aa.batch_number as BATCH_ID
         FROM
             jg_warehousing_outbound a
                 RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_id AND aa.f_delete_mark is null
                 LEFT JOIN jg_warehousing_notification b ON a.warehousing_id = b.id AND b.f_delete_mark IS NULL
                 LEFT JOIN jg_business_order c ON b.business_id = c.id AND c.f_delete_mark IS NULL
-                LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND b.f_delete_mark IS NULL
-                LEFT JOIN base_organize e ON a.company_id = e.f_id AND c.f_delete_mark IS NULL
-                LEFT JOIN base_organize f ON a.department_id = f.f_id AND d.f_delete_mark IS NULL
-                LEFT JOIN base_user g ON a.f_creator_user_id = g.f_id AND e.f_delete_mark IS NULL
-                LEFT JOIN jg_contract h ON c.contract_id = h.id AND f.f_delete_mark IS NULL
-                LEFT JOIN jg_business_line i ON a.warehouse_id = i.id AND i.f_delete_mark IS NULL
+                LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND d.f_delete_mark IS NULL
+                LEFT JOIN base_organize e ON a.company_id = e.f_id AND e.f_delete_mark IS NULL
+                LEFT JOIN base_organize f ON a.department_id = f.f_id AND f.f_delete_mark IS NULL
+                LEFT JOIN base_user g ON a.f_creator_user_id = g.f_id AND g.f_delete_mark IS NULL
+                LEFT JOIN jg_contract h ON c.contract_id = h.id AND h.f_delete_mark IS NULL
+                LEFT JOIN jg_business_cargo i ON aa.outbound_area_id = i.id AND i.f_delete_mark IS NULL
                 LEFT JOIN jg_product j ON aa.product_id = j.id AND j.f_delete_mark is null
                 LEFT JOIN base_user k ON a.f_last_modify_user_id = k.f_id AND k.f_delete_mark IS NULL
                 LEFT JOIN jg_delivery_order l on a.warehousing_id = l.id and l.f_delete_mark is null
                 LEFT JOIN jg_business_order m on l.business_id = m.id and m.f_delete_mark is null
                 LEFT JOIN jg_business_order_product_relational n on c.id = n.business_order_id and n.f_delete_mark is null and  aa.product_id = n.product_id and aa.outbound_unit = n.sales_main_unit_id and aa.ord_ln = n.ord_ln
-                LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and  aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id and aa.ord_ln = n.ord_ln
+                LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and  aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id and aa.ord_ln = o.ord_ln
+                LEFT JOIN jg_contract p ON m.contract_id = p.id AND p.f_delete_mark IS NULL
+                LEFT JOIN jg_subject_basic q ON m.first_subject_basic_id = q.id AND q.f_delete_mark IS NULL
+                LEFT JOIN jg_business_order r ON a.business_order_no = r.code AND r.f_delete_mark is null
+                LEFT JOIN jg_contract s ON r.contract_id = s.id AND s.f_delete_mark is null
         WHERE
             a.f_delete_mark is null
           AND a.id = #{id}
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
index 54cf24d4..f71b6b03 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
@@ -353,8 +353,8 @@
         SELECT
             a.id AS ID,
             e.f_en_code AS COMP_CD,
-            IF(a.warehousing_storage_type = '1',h.kucun_org_code,m.kucun_org_code) AS INV_ORG_CD,
-            IF(a.warehousing_storage_type = '1',h.kucun_org_name,m.kucun_org_name) AS INV_ORG_NM,
+            IF(a.warehousing_storage_type = '1',h.kucun_org_code,q.kucun_org_code) AS INV_ORG_CD,
+            IF(a.warehousing_storage_type = '1',h.kucun_org_name,q.kucun_org_name) AS INV_ORG_NM,
             f.f_en_code AS DEPT_CD,
             f.f_full_name AS DEPT_NM,
             g.f_id as ADD_CODE,
@@ -366,24 +366,12 @@
             a.warehousing_time AS RECEIPT_DTM,
             IF(a.warehousing_storage_type = '1',c.code,l.code) as ORD_NO,
             aa.ord_ln as ORD_LN,
-            IF(a.warehousing_storage_type = '1',h.contract_number,m.contract_number) AS CON_CD,
-            IF(a.warehousing_storage_type = '1',h.contract_no,m.contract_no) AS CON_NO,
+            IF(a.warehousing_storage_type = '1',h.contract_number,q.contract_number) AS CON_CD,
+            IF(a.warehousing_storage_type = '1',h.contract_no,q.contract_no) AS CON_NO,
             IF(a.warehousing_storage_type = '1',d.code,p.code) AS SUPPLIER_CD,
             IF(a.warehousing_storage_type = '1',d.name,p.name) AS SUPPLIER_NM,
-            i.NAME AS STO_NM,
-            CASE
-                a.warehousing_storage_status
-                WHEN '1' THEN
-                    '待提交'
-                WHEN '2' THEN
-                    '待审核'
-                WHEN '3' THEN
-                    '已入库'
-                WHEN '4' THEN
-                    '已驳回'
-                WHEN '5' THEN
-                    '已关闭'
-                END AS STO_STS,
+            r.cargo_name AS STO_NM,
+            '2' AS STO_STS,
             j.CODE AS ITEM_CD,
             j.NAME AS ITEM_NM,
             CASE
@@ -404,7 +392,7 @@
             a.warehousing_time AS STO_DTM,
             o.f_real_name as STO_CONFIRM_ID,
             a.f_last_modify_time as STO_CONFIRM_DTM,
-            '' as STO_FLAG,
+            '1' as STO_FLAG,
             'N' as READ_FLAG,
             null as READ_TIME,
             '' as ERR_MESSAGE,
@@ -429,13 +417,14 @@
                 AND m.f_delete_mark IS NULL
                 LEFT JOIN jg_receipt_order k on a.warehousing_id = k.id and k.f_delete_mark is null
                 LEFT JOIN jg_business_order l on k.business_id = l.id and l.f_delete_mark is null
-                LEFT JOIN jg_contract m ON l.contract_id = m.id AND m.f_delete_mark IS NULL
+                LEFT JOIN jg_contract q ON l.contract_id = q.id AND q.f_delete_mark IS NULL
                 LEFT JOIN jg_business_order_product_relational n ON l.id = n.business_order_id
                 AND aa.product_id = n.product_id
                 AND aa.storage_unit = n.sales_main_unit_id
                 AND n.f_delete_mark IS NULL
                 LEFT JOIN base_user o ON a.f_last_modify_user_id = o.f_id AND o.f_delete_mark IS NULL
                 LEFT JOIN jg_subject_basic p ON l.first_subject_basic_id = p.id AND p.f_delete_mark IS NULL
+                LEFT JOIN jg_business_cargo r ON aa.storage_area_id = r.id AND r.f_delete_mark is null
         WHERE
             a.f_delete_mark is null
           AND a.id = #{id}
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
index f4eb5801..0f97faea 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
@@ -160,11 +160,7 @@
             '产出' as PRD_TY,
             d.code as ITEM_CD,
             d.name as ITEM_NM,
-            case
-                d.is_input
-            when '1' then '产品'
-            when '2' then '副产品'
-            end as PROD_TY,
+            '产品' as PROD_TY,
             b.spec as SPEC_TYPE,
             b.proportion_num as QUANTITY,
             a.work_time as PRD_DATE,
@@ -175,7 +171,14 @@
             a.code as TASK_NM,
             b.batch_number as BATCH_ID,
             '已完成' as STATUS_FLAG,
-            e.name as ATTR1,
+            case e.name
+                when '日照金属打包线' then '打包产线'
+                when '日照金属剪切线' then '剪切产线'
+                when '日照金属破碎线' then '破碎产线'
+                when '日照金属火切线' then '火切产线'
+                when '日照金属众鹏委托加工线' then '众鹏委托加工产线'
+                when '日照金属龙口委托加工线' then '龙口委托加工产线'
+            end as ATTR1,
             k.code as ATTR2,
             k.name as ATTR3,
             h.f_real_name as CREATE_EMP_ID,
@@ -190,13 +193,11 @@
         right join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null
         left join jg_product d on b.product_id = d.id and d.f_delete_mark is null
         left join jg_business_line e on a.business_id = e.id and e.f_delete_mark is null
-        left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null
-        left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null
         left join base_user h on a.f_creator_user_id  = h.f_id and h.f_delete_mark is null
         left join jg_bom i on b.bom_id = i.id and i.f_delete_mark is null
         left join jg_bom_item j on i.id = j.bom_id and j.f_delete_mark is null
         left join jg_product k on j.product_id = k.id and k.f_delete_mark is null
-        left join base_organzie l on a.company_id = l.f_id and l.f_delete_mark is null
+        left join base_organize l on a.company_id = l.f_id and l.f_delete_mark is null
         left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null
         left join jg_business_cargo n on b.cargo_id = n.id and n.f_delete_mark is null
         where a.f_delete_mark is null and a.id =#{id}
@@ -208,11 +209,14 @@
             m.yunguan_value as ORGANIZATION_CODE,
             l.f_full_name as ORGANIZATION_NM,
             a.code as TASK_NO,
-            '投入' as PRD_TY,
+            case c.is_input
+                when '1' then '原料'
+                when '2' then '副产品'
+            end as PRD_TY,
             d.code as ITEM_CD,
             d.name as ITEM_NM,
             '原料' as PROD_TY,
-            c.spec as SPEC_TYPE,
+            d.spec as SPEC_TYPE,
             c.reality_num as QUANTITY,
             a.work_time as PRD_DATE,
             b.unit_id as UOM,
@@ -238,13 +242,11 @@
                  right join jg_work_order_primary c on a.id = c.work_id and c.f_delete_mark is null
                  left join jg_product d on a.product_id = d.id and d.f_delete_mark is null
                  left join jg_business_line e on a.business_id = e.id and e.f_delete_mark is null
-                 left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null
-                 left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null
                  left join base_user h on a.f_creator_user_id  = h.f_id and h.f_delete_mark is null
                  left join jg_bom i on b.bom_id = i.id and i.f_delete_mark is null
                  left join jg_bom_item j on i.id = j.bom_id and j.f_delete_mark is null
                  left join jg_product k on j.product_id = k.id and k.f_delete_mark is null
-                 left join base_organzie l on a.company_id = l.f_id and l.f_delete_mark is null
+                 left join base_organize l on a.company_id = l.f_id and l.f_delete_mark is null
                  left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null
                  left join jg_business_cargo n on c.cargo_id = n.id and n.f_delete_mark is null
              where a.f_delete_mark is null and a.id =#{id}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java
index 8dbe458c..f245e179 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java
@@ -9,7 +9,9 @@ import java.math.BigDecimal;
 import java.util.*;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import jnpf.model.yunguan.YunguanPurchaseInBoundModel;
 import jnpf.model.yunguan.YunguanSaleOutBoundModel;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * warehousingOutbound
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
index 8882ef15..1158b4c2 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
@@ -990,7 +990,8 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         }
 
         //推送结算单到运管
-        /*if(ObjectUtil.equals(entity.getType(), "2")){
+        entity = this.getById(entity.getId());
+        if(ObjectUtil.equals(entity.getType(), "2")){
             //销售
             boolean headFlag = this.pushSaleHeadYunguan(entity, cwsettlementForm);
             if(headFlag){
@@ -1002,7 +1003,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
             if(headFlag){
                 boolean lineFlag = this.pushPurchaseLineYunguan(entity, cwsettlementForm);
             }
-        }*/
+        }
     }
 
     private boolean pushPurchaseLineYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
@@ -1019,12 +1020,12 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
             SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
             ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getById(cwsettlementForm.getCwsettlementsummaryList().get(0).getProductId());
             ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
-            yunguanSaleSettlementProductModel.setATTRIBUTE3(contractLEntity.getKucunOrgCode());
-            yunguanSaleSettlementProductModel.setORG_ID(contractLEntity.getKucunOrgName());
+//            yunguanSaleSettlementProductModel.setATTRIBUTE3(contractLEntity.getKucunOrgCode());
+            yunguanSaleSettlementProductModel.setORG_ID(contractLEntity.getKucunOrgCode());
             OrganizeEntity departmentEntity = organizeService.getById(cwsettlementEntity.getDepartmentId());
             if(departmentEntity != null){
                 yunguanSaleSettlementProductModel.setDEPARTMENT_CODE(departmentEntity.getEnCode());
-                yunguanSaleSettlementProductModel.setATTRIBUTE9(departmentEntity.getFullName());
+//                yunguanSaleSettlementProductModel.setATTRIBUTE9(departmentEntity.getFullName());
             }
             yunguanSaleSettlementProductModel.setACCOUNT_NO(cwsettlementEntity.getCode());
             yunguanSaleSettlementProductModel.setACCOUNT_LINE_NO(i);
@@ -1083,7 +1084,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         }
         yunguanSaleSettlementModel.setACCOUNT_NO(cwsettlementEntity.getCode());
         SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
-        yunguanSaleSettlementModel.setVENDOR_CD(subjectbasicEntity.getId());
+        yunguanSaleSettlementModel.setVENDOR_CD(subjectbasicEntity.getCode());
         yunguanSaleSettlementModel.setVENDOR_NAME(subjectbasicEntity.getName());
         //供应商地点编码
         yunguanSaleSettlementModel.setVENDOR_SITE_CODE("");
@@ -1180,19 +1181,19 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
             yunguanSaleSettlementProductModel.setITEM_NM(productWarehouseEntity.getName());
             yunguanSaleSettlementProductModel.setMAT_SIZE(productWarehouseEntity.getSpec());
             //销售数量
-            yunguanSaleSettlementProductModel.setORD_PRICE(cwsettlementsummaryModel.getSettlementPrice());
+            yunguanSaleSettlementProductModel.setORD_PRICE(new BigDecimal(cwsettlementsummaryModel.getSettlementPrice()));
             //销售单价
-            yunguanSaleSettlementProductModel.setORD_QUANTITY(cwsettlementsummaryModel.getSettlementSum());
-            yunguanSaleSettlementProductModel.setQUANTITY(cwsettlementsummaryModel.getSettlementSum());
+            yunguanSaleSettlementProductModel.setORD_QUANTITY(new BigDecimal(cwsettlementsummaryModel.getSettlementSum()));
+            yunguanSaleSettlementProductModel.setQUANTITY(new BigDecimal(cwsettlementsummaryModel.getSettlementSum()));
             //出库量
             yunguanSaleSettlementProductModel.setSTO_OUT_WGT(cwsettlementsummaryModel.getStorageNumber());
             yunguanSaleSettlementProductModel.setUNIT(cwsettlementsummaryModel.getSettlementUnit());
-            yunguanSaleSettlementProductModel.setINV_PRICE(cwsettlementsummaryModel.getSettlementPrice());
-            yunguanSaleSettlementProductModel.setINV_AMT(cwsettlementsummaryModel.getSettlementSubtotal());
+            yunguanSaleSettlementProductModel.setINV_PRICE(new BigDecimal(cwsettlementsummaryModel.getSettlementPrice()));
+            yunguanSaleSettlementProductModel.setINV_AMT(new BigDecimal(cwsettlementsummaryModel.getSettlementSubtotal()));
             yunguanSaleSettlementProductModel.setTAX_RATE("VAT_OUT_"+cwsettlementsummaryModel.getRate());
             yunguanSaleSettlementProductModel.setCURRENCY_TY("CNY");
-            yunguanSaleSettlementProductModel.setINV_AMT_FOREG(cwsettlementsummaryModel.getSettlementPrice());
-            yunguanSaleSettlementProductModel.setINV_EXCHG_RAT("1");
+            yunguanSaleSettlementProductModel.setINV_AMT_FOREG(new BigDecimal(cwsettlementsummaryModel.getSettlementPrice()));
+            yunguanSaleSettlementProductModel.setINV_EXCHG_RAT(new BigDecimal(1));
             yunguanSaleSettlementProductModel.setITEM_NM_INV(cwsettlementsummaryModel.getItemNmInv());
             yunguanSaleSettlementProductModel.setATTRIBUTE5(cwsettlementsummaryModel.getRemark());
             yunguanSaleSettlementProductModel.setBOOK_DATE(cwsettlementEntity.getBookDate());
@@ -1214,6 +1215,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
             yunguanSaleSettlementProductModel.setESB_STATUS("N");
             //错误信息
             yunguanSaleSettlementProductModel.setERR_MESSAGE("");
+            yunguanSaleSettlementProductModel.setCK_ORDER(cwsettlementsummaryModel.getDocmentNo());
             yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel);
         }
         JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
@@ -1251,7 +1253,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
             yunguanSaleSettlementModel.setINV_FLAG(new BigDecimal("-1"));
         }
         SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
-        yunguanSaleSettlementModel.setCUST_ID(subjectbasicEntity.getId());
+        yunguanSaleSettlementModel.setCUST_ID(subjectbasicEntity.getCode());
         yunguanSaleSettlementModel.setCUST_NAME(subjectbasicEntity.getName());
         yunguanSaleSettlementModel.setCONTRACT_CD(contractLEntity.getContractNumber());
         yunguanSaleSettlementModel.setKH_CONTR_NO(contractLEntity.getContractNo());
@@ -1267,13 +1269,16 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         yunguanSaleSettlementModel.setINV_AMT(settlementTotal);
         //查询对账单对应的出库单
         BigDecimal storageNum = new BigDecimal("0");
-        for (CwsettlementaccountModel cwsettlementaccountModel : cwsettlementForm.getCwsettlementaccountList()) {
-            QueryWrapper<CwaccountstorageEntity> CwaccountstoragequeryWrapper = new QueryWrapper<>();
-            CwaccountstoragequeryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, cwsettlementaccountModel.getAccountId());
-            List<CwaccountstorageEntity> cwaccountstorageEntities = cwaccountstorageService.list(CwaccountstoragequeryWrapper);
-            for (CwaccountstorageEntity cwaccountstorageEntity : cwaccountstorageEntities) {
-                storageNum.add(cwaccountstorageEntity.getStorageNum());
-            }
+//        for (CwsettlementaccountModel cwsettlementaccountModel : cwsettlementForm.getCwsettlementaccountList()) {
+//            QueryWrapper<CwaccountstorageEntity> CwaccountstoragequeryWrapper = new QueryWrapper<>();
+//            CwaccountstoragequeryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, cwsettlementaccountModel.getAccountId());
+//            List<CwaccountstorageEntity> cwaccountstorageEntities = cwaccountstorageService.list(CwaccountstoragequeryWrapper);
+//            for (CwaccountstorageEntity cwaccountstorageEntity : cwaccountstorageEntities) {
+//                storageNum.add(cwaccountstorageEntity.getStorageNum());
+//            }
+//        }
+        for (CwsettlementsummaryModel entity : cwsettlementForm.getCwsettlementsummaryList()){
+            storageNum = storageNum.add(entity.getStorageNumber());
         }
         yunguanSaleSettlementModel.setSTO_OUT_WGT(storageNum);
         yunguanSaleSettlementModel.setCURRENCY_TY("CNY");
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
index 623bbfae..0fafcb0e 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
@@ -8,6 +8,7 @@ import jnpf.mapper.WarehousingNotificationMapper;
 import jnpf.mapper.WarehousingOutboundMapper;
 import jnpf.model.deliveryorder.DeliveryOrderForm;
 import jnpf.model.deliveryorder.DeliveryProductRelationModel;
+import jnpf.model.yunguan.YunguanPurchaseInBoundModel;
 import jnpf.model.yunguan.YunguanSaleOutBoundModel;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -910,20 +911,16 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 warehousingOutboundPoundlistService.saveOrUpdate(entitys);
             }
         }
-//        if (entity.getWarehousingOutboundType().equals("12")){
-//            List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModel = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
-////            List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundProductByYunGuan(entity.getId());
-////            for (YunguanSaleOutBoundModel model : yunguanSaleOutBoundModelList){
-////                BeanMergeUtil.merge(model,yunguanSaleOutBoundModel);
-////            }
-//            if (yunguanSaleOutBoundModel != null && yunguanSaleOutBoundModel.size()>0) {
-//                JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModel));
-//                if (ObjectUtil.isNotEmpty(saleCode)){
-//                    if (saleCode.get("code").equals("200")) {
-//                    }
-//                }
-//            }
-//        }
+        if (entity.getWarehousingOutboundType().equals("12")){
+            List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
+            if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
+                JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
+                if (ObjectUtil.isNotEmpty(saleCode)){
+                    if (saleCode.get("code").equals("200")) {
+                    }
+                }
+            }
+        }
     }
 
     @Override
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
index 1a79d89e..db7b1e80 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
@@ -951,20 +951,16 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                 warehousingStoragePoundlistService.saveOrUpdate(entitys);
             }
         }
-//        if (entity.getWarehousingStorageType().equals("15")){
-//            List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModel = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
-////            List<YunguanPurchaseInBoundModel> yunguanPurchaseProductInBoundModelList = warehousingStorageMapper.purchaseInBoundProductByYunGuan(entity.getId());
-////            for (YunguanPurchaseInBoundModel model : yunguanPurchaseProductInBoundModelList){
-////                BeanMergeUtil.merge(model,yunguanPurchaseInBoundModel);
-////            }
-//            if (yunguanPurchaseInBoundModel != null && yunguanPurchaseInBoundModel.size()>0) {
-//                JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModel));
-//                if (ObjectUtil.isNotEmpty(purchaseCode)){
-//                    if (purchaseCode.get("code").equals("200")) {
-//                    }
-//                }
-//            }
-//        }
+        if (entity.getWarehousingStorageType().equals("15")){
+            List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
+            if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
+                JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
+                if (ObjectUtil.isNotEmpty(purchaseCode)){
+                    if (purchaseCode.get("code").equals("200")) {
+                    }
+                }
+            }
+        }
     }
 
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
index 25df3235..0460e04a 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
@@ -625,29 +625,34 @@ public class BusinessOrderController {
                         }else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){
                             entity.setStatus("4");//销售单直送审核通过后状态改为待出库
                         }
-//                        if (entity.getBusinessType().equals("1")) {
-//                            YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
-//                            if (ObjectUtil.isNotEmpty(purchaseOrder)) {
-//                                JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
-//                                if (ObjectUtil.isNotEmpty(purchaseCode)){
-//                                    if (purchaseCode.get("code").equals("200")) {
-//                                        List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
-//                                        JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
-//                                    }
-//                            }
-//                        }
-//                        }else if (entity.getBusinessType().equals("2")){
-//                            YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
-//                            if (ObjectUtil.isNotEmpty(saleOrder)){
-//                                JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
-//                                if (ObjectUtil.isNotEmpty(saleCode)) {
-//                                    if (saleCode.get("code").equals("200")) {
-//                                        List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
-//                                        JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
-//                                    }
-//                                }
-//                            }
-//                        }
+                        if (entity.getBusinessType().equals("1")) {
+                            YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
+                            purchaseOrder.setSUPPLIER_SITE_ID("12345");
+                            if (ObjectUtil.isNotEmpty(purchaseOrder)) {
+                                JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
+                                if (ObjectUtil.isNotEmpty(purchaseCode)){
+                                    if (purchaseCode.get("code").equals("200")) {
+                                        List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
+                                        JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
+                                        if(ObjectUtil.isNotEmpty(purchaseCode)){
+                                            System.out.println(purchaseCode.toString());
+                                        }
+                                    }
+                            }
+                        }
+                        }else if (entity.getBusinessType().equals("2")){
+                            YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
+                            if (ObjectUtil.isNotEmpty(saleOrder)){
+                                JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
+                                if (ObjectUtil.isNotEmpty(saleCode)) {
+                                    if (saleCode.get("code").equals("200")) {
+                                        List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
+                                        JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
+                                        System.out.println(saleProductCode);
+                                    }
+                                }
+                            }
+                        }
                         businessOrderService.saveOrUpdate(entity);
                     }
                 }
@@ -1236,7 +1241,7 @@ public class BusinessOrderController {
     @GetMapping("/createReceiptOrderByVoucher")
     public ActionResult createReceiptOrderByVoucher(@RequestParam("businessOrderId") String businessOrderId)throws IOException{
         QueryWrapper<BusinessOrderEntity> businessOrderQueryWrapper=new QueryWrapper<>();
-                businessOrderQueryWrapper.eq("a.id",businessOrderId);
+        businessOrderQueryWrapper.eq("a.id",businessOrderId);
         businessOrderQueryWrapper.isNull("a.f_delete_mark");
         businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
         List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper);
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java
index 301c5b5d..256d1edd 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java
@@ -687,6 +687,16 @@ public class WarehousingOutboundController {
                         //inventoryLogEntity.setRetailPrice();//零售价
                         inventoryLogService.saveOrUpdate(inventoryLogEntity);
                     }
+                    if (entity.getWarehousingOutboundType().equals("12")){
+                        List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundByYunGuan(entity.getId());
+                        if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
+                            JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
+                            if (ObjectUtil.isNotEmpty(saleCode)){
+                                if (saleCode.get("code").equals("200")) {
+                                }
+                            }
+                        }
+                    }
                 }
             }catch(Exception e){
                 return ActionResult.fail("修改数据失败");
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java
index 1754ad84..52c83f90 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java
@@ -715,16 +715,16 @@ public class WarehousingStorageController {
                         //inventoryLogEntity.setRetailPrice();//零售价
                         inventoryLogService.saveOrUpdate(inventoryLogEntity);
                     }
-//                        if (entity.getWarehousingStorageType().equals("1") || entity.getWarehousingStorageType().equals("15")){
-//                            List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
-//                            if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
-//                                JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
-//                                if (ObjectUtil.isNotEmpty(purchaseCode)){
-//                                    if (purchaseCode.get("code").equals("200")) {
-//                                    }
-//                                }
-//                            }
-//                        }
+                        if (entity.getWarehousingStorageType().equals("1")){
+                            List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
+                            if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
+                                JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
+                                if (ObjectUtil.isNotEmpty(purchaseCode)){
+                                    if (purchaseCode.get("code").equals("200")) {
+                                    }
+                                }
+                            }
+                        }
                 }
                 }
             }catch(Exception e){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
index 65fb79dd..b1cb50e5 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
@@ -1161,13 +1161,13 @@ public class WorkOrderController {
                             }
 
                         }
-//                        List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
-//                        List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
-//                        yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
-//                        JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
-//                        if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
-//
-//                        }
+                        List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
+                        List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
+                        yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
+                        JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
+                        if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
+
+                        }
                     }
                 }
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
index 5bc29139..d8da3563 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
@@ -115,7 +115,7 @@ public class YunguanInterfaceController {
             if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity2)){
                 entity.setEnterpriseNature(dictionaryyunguandataEntity2.getZhihuiValue());//企业性质
             }
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-NN-dd HH:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (ObjectUtil.isNotEmpty(jsonObject.get("VALID_FROM"))) {
                 try {
                     entity.setCollaborationStart(sdf.parse(jsonObject.get("VALID_FROM").toString()));//合作开始时间
@@ -166,7 +166,7 @@ public class YunguanInterfaceController {
             if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity2)){
                 subjectbasicEntity.setEnterpriseNature(dictionaryyunguandataEntity2.getZhihuiValue());//企业性质
             }
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-NN-dd HH:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (ObjectUtil.isNotEmpty(jsonObject.get("VALID_FROM"))) {
                 try {
                     subjectbasicEntity.setCollaborationStart(sdf.parse(jsonObject.get("VALID_FROM").toString()));//合作开始时间
@@ -233,7 +233,7 @@ public class YunguanInterfaceController {
             if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity2)){
                 entity.setEnterpriseNature(dictionaryyunguandataEntity2.getZhihuiValue());//企业性质
             }
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-NN-dd HH:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (ObjectUtil.isNotEmpty(jsonObject.get("TAX_EFFECTIVE_FROM"))) {
                 try {
                     entity.setCollaborationStart(sdf.parse(jsonObject.get("TAX_EFFECTIVE_FROM").toString()));//合作开始时间
@@ -281,7 +281,7 @@ public class YunguanInterfaceController {
             if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity2)){
                 subjectbasicEntity.setEnterpriseNature(dictionaryyunguandataEntity2.getZhihuiValue());//企业性质
             }
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-NN-dd HH:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (ObjectUtil.isNotEmpty(jsonObject.get("TAX_EFFECTIVE_FROM"))) {
                 try {
                     subjectbasicEntity.setCollaborationStart(sdf.parse(jsonObject.get("TAX_EFFECTIVE_FROM").toString()));//合作开始时间
@@ -484,10 +484,12 @@ public class YunguanInterfaceController {
         //风险提示
         contractLEntity.setRiskInfo(ObjectUtil.isNotEmpty(jsonObject.get("RISK_INFO")) ? jsonObject.get("RISK_INFO").toString() : "");
         //销售类型
-        if(ObjectUtil.equal("自产", jsonObject.get("SAL_INV_TYPE").toString())){
-            contractLEntity.setSalInvType("1");
-        }else {
-            contractLEntity.setSalInvType("2");
+        if (ObjectUtil.isNotEmpty(jsonObject.get("SAL_INV_TYPE"))) {
+            if (ObjectUtil.equal("自产", jsonObject.get("SAL_INV_TYPE").toString())) {
+                contractLEntity.setSalInvType("1");
+            } else {
+                contractLEntity.setSalInvType("2");
+            }
         }
         contractLService.saveOrUpdate(contractLEntity);
         return ActionResult.success("运管推送合同信息到智慧成功");
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java
index ebd6471f..f78b3efd 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java
@@ -25,6 +25,9 @@ public class YunguanSaleOrderModel {
     /** 库存组织名称 **/
     @JSONField(name = "ORG_NM")
     private String ORG_NM;
+    /** 库存组织名称 **/
+    @JSONField(name = "DEPARTMENT_CD")
+    private String DEPARTMENT_CD;
     /** 部门编码 **/
     @JSONField(name = "ADD_DEPT_CODE")
     private String ADD_DEPT_CODE;
@@ -111,7 +114,7 @@ public class YunguanSaleOrderModel {
     private String REP_ADS;
     /** 制单人名称 **/
     @JSONField(name = "ORD_REG_DTM")
-    private String ORD_REG_DTM;
+    private Date ORD_REG_DTM;
     /** 制单时间 **/
     @JSONField(name = "CREATE_EMP_ID")
     private String CREATE_EMP_ID;
@@ -126,8 +129,11 @@ public class YunguanSaleOrderModel {
     private Date MODIFY_DTM;
     /** 制单时间 **/
     @JSONField(name = "ORD_CONF_DTM")
-    private String ORD_CONF_DTM;
+    private Date ORD_CONF_DTM;
     /** 制单时间 **/
     @JSONField(name = "CANCLE_YN")
-    private Date CANCLE_YN;
+    private String CANCLE_YN;
+    /** 行数 **/
+    @JSONField(name = "LINE_SUM")
+    private Integer LINE_SUM;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java
index f59ac3df..63b3d0b3 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java
@@ -67,13 +67,13 @@ public class YunguanSaleSettlementProductModel {
     private String MAT_SIZE;
     /** 销售单价 **/
     @JSONField(name = "ORD_PRICE")
-    private String ORD_PRICE;
+    private BigDecimal ORD_PRICE;
     /** 销售数量 **/
     @JSONField(name = "ORD_QUANTITY")
-    private String ORD_QUANTITY;
+    private BigDecimal ORD_QUANTITY;
     /** 结算数量 **/
     @JSONField(name = "QUANTITY")
-    private String QUANTITY;
+    private BigDecimal QUANTITY;
     /** 对应出库量 **/
     @JSONField(name = "STO_OUT_WGT")
     private BigDecimal STO_OUT_WGT;
@@ -82,10 +82,10 @@ public class YunguanSaleSettlementProductModel {
     private String UNIT;
     /** 结算单价 **/
     @JSONField(name = "INV_PRICE")
-    private String INV_PRICE;
+    private BigDecimal INV_PRICE;
     /** 结算金额 **/
     @JSONField(name = "INV_AMT")
-    private String INV_AMT;
+    private BigDecimal INV_AMT;
     /** 税码 **/
     @JSONField(name = "TAX_RATE")
     private String TAX_RATE;
@@ -94,10 +94,10 @@ public class YunguanSaleSettlementProductModel {
     private String CURRENCY_TY;
     /** 结算金额（外币） **/
     @JSONField(name = "INV_AMT_FOREG")
-    private String INV_AMT_FOREG;
+    private BigDecimal INV_AMT_FOREG;
     /** 结算汇率 **/
     @JSONField(name = "INV_EXCHG_RAT")
-    private String INV_EXCHG_RAT;
+    private BigDecimal INV_EXCHG_RAT;
     /** 开票商品名称 **/
     @JSONField(name = "ITEM_NM_INV")
     private String ITEM_NM_INV;
@@ -152,4 +152,8 @@ public class YunguanSaleSettlementProductModel {
     /** ESB错误信息 **/
     @JSONField(name = "ESB_MESSAGE")
     private String ESB_MESSAGE;
+    /** 出库单号 **/
+    @JSONField(name = "CK_ORDER")
+    private String CK_ORDER;
+
 }