Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jackYun' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into jackYun

Browse Source
This commit is contained in:
朱斌
2025-07-18 16:42:17 +08:00
parent 0e7fdbd1a6 4f85e23f4b
commit 80f1c5505e
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Reportapi/MyCode.Project.Infrastructure/Common/JsonHelper.cs
View File

@@ -110,7 +110,8 @@ namespace MyCode.Project.Infrastructure.Common
/// <param name="target">目标对象</param> /// <param name="target">目标对象</param>
/// <param name="isConvertToSingleQuotes">是否将双引号转成单引号</param> /// <param name="isConvertToSingleQuotes">是否将双引号转成单引号</param>
/// <param name="isFirstLetterSmall">是否首字母小写</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) if (target == null)
return "{}"; return "{}";
@@ -125,7 +126,8 @@ namespace MyCode.Project.Infrastructure.Common
{ {
var settings = new JsonSerializerSettings(); var settings = new JsonSerializerSettings();
settings.ContractResolver = new CamelCasePropertyNamesContractResolver();//首字母小写驼峰式命名 settings.ContractResolver = new CamelCasePropertyNamesContractResolver();//首字母小写驼峰式命名
if(nullValueHandling)
settings.NullValueHandling = NullValueHandling.Ignore;
result = JsonConvert.SerializeObject(target,settings); result = JsonConvert.SerializeObject(target,settings);
} }

5
Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs
View File

@@ -2,6 +2,7 @@
using MyCode.Project.Domain.Message.Request.KingDee; using MyCode.Project.Domain.Message.Request.KingDee;
using MyCode.Project.Domain.Message.Response.KingDee; using MyCode.Project.Domain.Message.Response.KingDee;
using MyCode.Project.Infrastructure.Common; using MyCode.Project.Infrastructure.Common;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Configuration; using System.Configuration;
@@ -92,8 +93,8 @@ namespace MyCode.Project.OutSideService.Implementation
public string Save(string formId, BillSave billSave) public string Save(string formId, BillSave billSave)
{ {
staClient = GetK3CloudClient(); staClient = GetK3CloudClient();
var datastr = JsonHelper.ToJson(billSave); var datastr = JsonHelper.ToJson(billSave,false, false, true);
//LogHelper.Info(datastr); LogHelper.Info(datastr);
var resultString = staClient.Save(formId, datastr); var resultString = staClient.Save(formId, datastr);
if (resultString.Contains("ErrorCode")) if (resultString.Contains("ErrorCode"))
{ {

3
Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs
View File

@@ -111,6 +111,7 @@ namespace MyCode.Project.Services.Implementation
var OutStockHead = list.Where(t => t.type != "+").Select(p => p.relDataId).Distinct().ToList(); var OutStockHead = list.Where(t => t.type != "+").Select(p => p.relDataId).Distinct().ToList();
OutStockHead.ForEach(relDataId => OutStockHead.ForEach(relDataId =>
{ {
CreateAndStockoutGetRequestBizData requestBizData = new CreateAndStockoutGetRequestBizData(); CreateAndStockoutGetRequestBizData requestBizData = new CreateAndStockoutGetRequestBizData();
List<stockOutDetailViews> stockOutDetailViews = new List<stockOutDetailViews>(); 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); JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.CREATEANDSTOCKOUT).Value, "1.0", requestBizData);
//判断返回结果是否成功 //判断返回结果是否成功
if (response.code == "200") if (response.code == "200")
{ {
_wMStoJackyunInventoryMovementView1Repository.UpdateStatus(2, relDataId); _wMStoJackyunInventoryMovementView1Repository.UpdateStatus(2, relDataId);
} }
else else

2
Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
View File

@@ -18,7 +18,7 @@ using System.Threading.Tasks;
namespace MyCode.Project.Services.Implementation namespace MyCode.Project.Services.Implementation
{ {
public class OrderPushService : IOrderPushService //, IOrderPushService public class OrderPushService : IOrderPushService
{ {
private IJackYunService _jackYunService; private IJackYunService _jackYunService;
private IJackOrdersRepository _jackOrdersRepository; private IJackOrdersRepository _jackOrdersRepository;