From 855706e9ca87fdc959a36b7e7f3456c48cf242b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=96=8C?= <1324361213@qq.com>
Date: Mon, 28 Jul 2025 11:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E5=9C=A8=E6=B2=A1=E5=AE=A1=E6=A0=B8=E6=97=B6=E4=B9=9F?=
=?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Response/KingDee/K3Result/K3ApiResult.cs | 2 +-
...ResponseStatus.cs => K3CloudResponseStatus.cs} | 8 ++++----
.../Model/{KingdeeResult.cs => K3CloudResult.cs} | 6 +++---
.../Model/{ResultInfo.cs => K3CloudResultInfo.cs} | 2 +-
.../{SuccessEntity.cs => K3CloudSuccessEntity.cs} | 2 +-
.../KingDee/K3Result/Model/SuccessMessage.cs | 10 ----------
.../MyCode.Project.Domain.csproj | 9 ++++-----
.../IKingDeeService.cs | 2 +-
.../Implementation/KingDeeService.cs | 2 +-
.../Implementation/OrderPushService.cs | 15 ++++++++-------
10 files changed, 24 insertions(+), 34 deletions(-)
rename Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/{ResponseStatus.cs => K3CloudResponseStatus.cs} (75%)
rename Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/{KingdeeResult.cs => K3CloudResult.cs} (85%)
rename Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/{ResultInfo.cs => K3CloudResultInfo.cs} (93%)
rename Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/{SuccessEntity.cs => K3CloudSuccessEntity.cs} (93%)
delete mode 100644 Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessMessage.cs
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/K3ApiResult.cs b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/K3ApiResult.cs
index 2463dd4..f600062 100644
--- a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/K3ApiResult.cs
+++ b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/K3ApiResult.cs
@@ -12,6 +12,6 @@ namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result
///
/// 返回对象
///
- public KingdeeResult Result { get; set; }
+ public K3CloudResult Result { get; set; }
}
}
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/ResponseStatus.cs b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResponseStatus.cs
similarity index 75%
rename from Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/ResponseStatus.cs
rename to Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResponseStatus.cs
index b54361b..a989972 100644
--- a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/ResponseStatus.cs
+++ b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResponseStatus.cs
@@ -5,7 +5,7 @@ namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
///
/// 响应对象
///
- public class ResponseStatus
+ public class K3CloudResponseStatus
{
///
/// 错误代码
@@ -18,15 +18,15 @@ namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
///
/// 错误信息列表
///
- public List Errors { get; set; }
+ public List Errors { get; set; }
///
/// 成功实体
///
- public List SuccessEntitys { get; set; }
+ public List SuccessEntitys { get; set; }
///
/// 成功消息
///
- public List SuccessMessages { get; set; }
+ public List SuccessMessages { get; set; }
///
/// 消息代码
///
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/KingdeeResult.cs b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResult.cs
similarity index 85%
rename from Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/KingdeeResult.cs
rename to Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResult.cs
index d329956..6ef3926 100644
--- a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/KingdeeResult.cs
+++ b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResult.cs
@@ -3,17 +3,17 @@
///
/// 返回类
///
- public class KingdeeResult
+ public class K3CloudResult
{
///
/// 响应对象
///
- public ResponseStatus ResponseStatus { get; set; }
+ public K3CloudResponseStatus ResponseStatus { get; set; }
///
/// 转换响应对象
///
- public ResponseStatus ConvertResponseStatus { get; set; }
+ public K3CloudResponseStatus ConvertResponseStatus { get; set; }
///
/// 返回结果，用于查看单据
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/ResultInfo.cs b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResultInfo.cs
similarity index 93%
rename from Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/ResultInfo.cs
rename to Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResultInfo.cs
index c4a22e5..f9634f6 100644
--- a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/ResultInfo.cs
+++ b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResultInfo.cs
@@ -3,7 +3,7 @@
///
/// 金蝶云星空查看错误信息类
///
- public class ResultInfo
+ public class K3CloudResultInfo
{
///
/// 字段名称
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessEntity.cs b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudSuccessEntity.cs
similarity index 93%
rename from Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessEntity.cs
rename to Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudSuccessEntity.cs
index 10c324d..ff2b0dd 100644
--- a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessEntity.cs
+++ b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudSuccessEntity.cs
@@ -3,7 +3,7 @@
///
/// 成功实体
///
- public class SuccessEntity
+ public class K3CloudSuccessEntity
{
///
/// 单据Id
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessMessage.cs b/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessMessage.cs
deleted file mode 100644
index 64de959..0000000
--- a/Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessMessage.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
-{
- ///
- /// 成功信息
- ///
- public class SuccessMessage
- {
-
- }
-}
diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
index 42732d3..0f51101 100644
--- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
+++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
@@ -81,11 +81,10 @@
-
-
-
-
-
+
+
+
+
diff --git a/Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs b/Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs
index 449ae8b..eef147b 100644
--- a/Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs
+++ b/Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs
@@ -11,7 +11,7 @@ namespace MyCode.Project.OutSideService
///
///
///
- ResponseStatus Save(string formId, BillSave billSave);
+ K3CloudResponseStatus Save(string formId, BillSave billSave);
}
diff --git a/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs b/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs
index 570c343..bdd5fd2 100644
--- a/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs
+++ b/Reportapi/MyCode.Project.OutSideService/Implementation/KingDeeService.cs
@@ -91,7 +91,7 @@ namespace MyCode.Project.OutSideService.Implementation
///
///
///
- public ResponseStatus Save(string formId, BillSave billSave)
+ public K3CloudResponseStatus Save(string formId, BillSave billSave)
{
staClient = GetK3CloudClient();
var datastr = JsonHelper.ToJson(billSave, false, false, true);
diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
index 2f8baf8..84144db 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
@@ -3,6 +3,7 @@ using MyCode.Project.Domain.Message.Request.KingDee.SaveModel;
using MyCode.Project.Domain.Message.Request.WMS;
using MyCode.Project.Domain.Message.Response.JackYun;
using MyCode.Project.Domain.Message.Response.KingDee.K3Result;
+using MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model;
using MyCode.Project.Domain.Message.Response.WMS;
using MyCode.Project.Domain.Model;
using MyCode.Project.Domain.Repositories;
@@ -24,7 +25,7 @@ using System.Threading.Tasks;
namespace MyCode.Project.Services.Implementation
{
- public class OrderPushService : ServiceBase, IOrderPushService
+ public class OrderPushService : ServiceBase, IOrderPushService
{
private IJackYunService _jackYunService;
private IJackOrdersRepository _jackOrdersRepository;
@@ -41,7 +42,7 @@ namespace MyCode.Project.Services.Implementation
, IYTKJTShopParameterRepository yTKJTShopParameterRepository
, IJackYunService jackYunService
, IKingDeeService kingDeeService,
- IWorkProcessService workProcessService )
+ IWorkProcessService workProcessService)
{
_yTKJTShopParameterRepository = yTKJTShopParameterRepository;
_pushKingDeeOrderRepository = pushKingDeeOrderRepository;
@@ -156,7 +157,7 @@ namespace MyCode.Project.Services.Implementation
_pushKingDeeOrderRepository.Add(pushKingDeeOrders);
_pushKingDeeOrderItemRepository.Add(pushKingDeeOrderItems);
}
- pushKingDeeOrders.ForEach(t=>
+ pushKingDeeOrders.ForEach(t =>
{
_workProcessService.Add(this.MerchantId, "PushOrderToKingDee", "推送订单到云星空或者WMS", t.Id, 1);
Thread.Sleep(300);
@@ -177,6 +178,7 @@ namespace MyCode.Project.Services.Implementation
var param = _yTKJTShopParameterRepository
.Queryable()
.Where(t => t.FSHOPCODE == orderHead.ShopCode)
+ .Where(t => t.FDOCUMENTSTATUS == "C") // 已审核
.First();
if (param is null)
{
@@ -270,8 +272,8 @@ namespace MyCode.Project.Services.Implementation
request.AddParameter("application/json", requestString, ParameterType.RequestBody);
IRestResponse response = client.Execute(request);
var resultContent = response.Content;
- LogHelper.Info("请求：" + requestString);
- LogHelper.Info("响应：" + resultContent);
+ LogHelper.Info("WMS请求：" + requestString);
+ LogHelper.Info("WMS响应：" + resultContent);
var result = JsonHelper.ToObject(resultContent);
if (result.Code != 200)
{
@@ -287,14 +289,13 @@ namespace MyCode.Project.Services.Implementation
/// 源单信息
/// 门店配置
///
- private Domain.Message.Response.KingDee.K3Result.Model.ResponseStatus PushKingdeeSaleOrder(PushKingDeeOrder pushKingdeeOrder, YTKJTShopParameter param)
+ private K3CloudResponseStatus PushKingdeeSaleOrder(PushKingDeeOrder pushKingdeeOrder, YTKJTShopParameter param)
{
var itemList = _pushKingDeeOrderItemRepository.Queryable().Where(t => pushKingdeeOrder.Id == t.PushKingDeeOrderId).ToList();
// 遍历单体，构造单据体实体
var entryList = itemList.Select(n => new FSaleOrderEntryItem()
{
Fcode = n.Barcode, // 条码带出物料 、物料带出税额
- //Fcode = "2120101128415", // 条码带出物料 、物料带出税额
FEntryTaxRate = param.FTAXRATE,
FQty = n.SellCount, // 销售数量
FTaxPrice = Math.Round(n.DivideSellTotal / n.SellCount, 10), // 含税单价等于 金额/总数