From c6fe50fdfdd1e9e5f643979778b4a914ff267f9b Mon Sep 17 00:00:00 2001
From: YXY <932687738@qq.com>
Date: Fri, 3 Nov 2023 16:34:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BE=E5=9B=9E=E7=BC=BA=E5=A4=B1=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/cjt/ManufactureOrderSyncCallOperate.java         | 4 ++--
 .../flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java
index 3ff3199..759a4d2 100644
--- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java
+++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/ManufactureOrderSyncCallOperate.java
@@ -72,12 +72,12 @@ public class ManufactureOrderSyncCallOperate extends CJTOperateCallBackAbstract
 //        body.put("创建时间", DateUtils.str2long(header.getString("CreatedTime"), DateUtils.YYYY_MM_DD));
         body.put("创建时间", System.currentTimeMillis());
 
-        JSONObject department = detail.getJSONObject("Department");
+        JSONObject department = header.getJSONObject("Department");
         if (department != null){
             body.put("生产车间", department.getString("Name"));
         }
 
-        JSONObject person = detail.getJSONObject("Person");
+        JSONObject person = header.getJSONObject("Person");
         if (person != null){
             body.put("负责人", person.getString("Name"));
         }
diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java
index 8f34493..e0b6333 100644
--- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java
+++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/strategy/cjt/SaleOrderSyncCallBackOperate.java
@@ -3,6 +3,7 @@ package com.ruoyi.flyingbook.strategy.cjt;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.enums.CjtAccountEnum;
 import com.ruoyi.common.enums.CjtCallBackOperateEnum;
+import com.ruoyi.common.enums.TableFieldTypeEnum;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.flyingbook.domain.edi.CJTEdiCallbackRequestVo;
 import org.springframework.stereotype.Component;
@@ -99,6 +100,7 @@ public class SaleOrderSyncCallBackOperate extends CJTOperateCallBackAbstract{
         body.put("累计执行数量", detail.getDoubleValue("累计执行数量"));
         body.put("明细备注", detail.getString("DetailMemo"));
         body.put("钢板面", getSpecialKey(detail, "pubuserdefnvc1"));
+        body.put("金额", detail.getString("OrigDiscountAmount"));
         switch (cjtAccountEnum) {
             case ONE:
                 body.put("客户备注", header.getString("CustomerMemo"));