From 4f85e23f4bd3df331f4d19597755dd82d597456e Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Fri, 18 Jul 2025 16:40:54 +0800
Subject: [PATCH] 1

---
 .../MyCode.Project.Infrastructure/Common/JsonHelper.cs      | 6 ++++--
 .../Implementation/KingDeeService.cs                        | 5 +++--
 .../Implementation/JackYunStockinService.cs                 | 3 ++-
 .../Implementation/OrderPushService.cs                      | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs b/Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs
index 6647ebc..0d10a7c 100644
--- a/Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs
+++ b/Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs
@@ -110,7 +110,8 @@ namespace MyCode.Project.Infrastructure.Common
         /// <param name="target">目标对象</param>
         /// <param name="isConvertToSingleQuotes">是否将双引号转成单引号</param>
         /// <param name="isFirstLetterSmall">是否首字母小写</param>
-        public static string ToJson(object target, bool isConvertToSingleQuotes = false,bool isFirstLetterSmall = false)
+        /// <param name="nullValueHandling">是否Null字段忽略不写入jason</param>
+        public static string ToJson(object target, bool isConvertToSingleQuotes = false,bool isFirstLetterSmall = false,bool nullValueHandling=false)
         {
             if (target == null)
                 return "{}";
@@ -125,7 +126,8 @@ namespace MyCode.Project.Infrastructure.Common
             {
                 var settings = new JsonSerializerSettings();
                 settings.ContractResolver = new CamelCasePropertyNamesContractResolver();//首字母小写驼峰式命名
-
+                if(nullValueHandling)
+                    settings.NullValueHandling = NullValueHandling.Ignore;
                 result = JsonConvert.SerializeObject(target,settings);
             }
 
diff --git a/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs b/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs
index 1dbe892..d556f46 100644
--- a/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs
+++ b/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs
@@ -2,6 +2,7 @@
 using MyCode.Project.Domain.Message.Request.KingDee;
 using MyCode.Project.Domain.Message.Response.KingDee;
 using MyCode.Project.Infrastructure.Common;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -92,8 +93,8 @@ namespace MyCode.Project.OutSideService.Implementation
         public string Save(string formId, BillSave billSave)
         {
             staClient = GetK3CloudClient();
-            var datastr = JsonHelper.ToJson(billSave);
-            //LogHelper.Info(datastr);
+            var datastr = JsonHelper.ToJson(billSave,false, false, true);
+            LogHelper.Info(datastr);
             var resultString = staClient.Save(formId, datastr);
             if (resultString.Contains("ErrorCode"))
             {
diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs
index 7177d46..91e0a52 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs
@@ -111,6 +111,7 @@ namespace MyCode.Project.Services.Implementation
             var OutStockHead = list.Where(t => t.type != "+").Select(p => p.relDataId).Distinct().ToList();
             OutStockHead.ForEach(relDataId =>
             {
+                
                 CreateAndStockoutGetRequestBizData requestBizData = new CreateAndStockoutGetRequestBizData();
                 List<stockOutDetailViews> stockOutDetailViews = new List<stockOutDetailViews>();
 
@@ -140,7 +141,7 @@ namespace MyCode.Project.Services.Implementation
                 JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.CREATEANDSTOCKOUT).Value, "1.0", requestBizData);
                 //判断返回结果是否成功
                 if (response.code == "200")
-                {
+                {                    
                     _wMStoJackyunInventoryMovementView1Repository.UpdateStatus(2, relDataId);
                 }
                 else
diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
index 6b37355..4458720 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
@@ -17,7 +17,7 @@ using System.Threading.Tasks;
 
 namespace MyCode.Project.Services.Implementation
 {
-    public class OrderPushService : IOrderPushService //, IOrderPushService
+    public class OrderPushService : IOrderPushService 
     {
         private IJackYunService _jackYunService;
         private IJackOrdersRepository _jackOrdersRepository;