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

修复系统参数在没审核时也生效的问题

Browse Source
This commit is contained in:
朱斌 2025-07-28 11:57:11 +08:00
parent 1e85ccf537
commit 855706e9ca
10 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/K3ApiResult.cs
View File

@ -12,6 +12,6 @@ namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result
/// <summary>
/// 返回对象
/// </summary>
public KingdeeResult Result { get; set; }
public K3CloudResult Result { get; set; }
}
}

8
Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/ResponseStatus.cs → Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResponseStatus.cs
View File

@ -5,7 +5,7 @@ namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
/// <summary>
/// 响应对象
/// </summary>
public class ResponseStatus
public class K3CloudResponseStatus
{
/// <summary>
/// 错误代码
@ -18,15 +18,15 @@ namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
/// <summary>
/// 错误信息列表
/// </summary>
public List<ResultInfo> Errors { get; set; }
public List<K3CloudResultInfo> Errors { get; set; }
/// <summary>
/// 成功实体
/// </summary>
public List<SuccessEntity> SuccessEntitys { get; set; }
public List<K3CloudSuccessEntity> SuccessEntitys { get; set; }
/// <summary>
/// 成功消息
/// </summary>
public List<ResultInfo> SuccessMessages { get; set; }
public List<K3CloudResultInfo> SuccessMessages { get; set; }
/// <summary>
/// 消息代码
/// </summary>

6
Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/KingdeeResult.cs → Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResult.cs
View File

@ -3,17 +3,17 @@
/// <summary>
/// 返回类
/// </summary>
public class KingdeeResult
public class K3CloudResult
{
/// <summary>
/// 响应对象
/// </summary>
public ResponseStatus ResponseStatus { get; set; }
public K3CloudResponseStatus ResponseStatus { get; set; }
/// <summary>
/// 转换响应对象
/// </summary>
public ResponseStatus ConvertResponseStatus { get; set; }
public K3CloudResponseStatus ConvertResponseStatus { get; set; }
/// <summary>
/// 返回结果，用于查看单据

2
Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/ResultInfo.cs → Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudResultInfo.cs
View File

@ -3,7 +3,7 @@
/// <summary>
/// 金蝶云星空查看错误信息类
/// </summary>
public class ResultInfo
public class K3CloudResultInfo
{
/// <summary>
/// 字段名称

2
Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessEntity.cs → Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/K3CloudSuccessEntity.cs
View File

@ -3,7 +3,7 @@
/// <summary>
/// 成功实体
/// </summary>
public class SuccessEntity
public class K3CloudSuccessEntity
{
/// <summary>
/// 单据Id

10
Reportapi/MyCode.Project.Domain/Message/Response/KingDee/K3Result/Model/SuccessMessage.cs
View File

@ -1,10 +0,0 @@
namespace MyCode.Project.Domain.Message.Response.KingDee.K3Result.Model
{
/// <summary>
/// 成功信息
/// </summary>
public class SuccessMessage
{
}
}

9
Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
View File

@ -81,11 +81,10 @@
<Compile Include="Message\Response\JackYun\PushOrderListResp.cs" />
<Compile Include="Message\Response\KingDee\ErrorResponse.cs" />
<Compile Include="Message\Response\KingDee\K3Result\K3ApiResult.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\KingdeeResult.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\ResponseStatus.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\ResultInfo.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\SuccessEntity.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\SuccessMessage.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\K3CloudResult.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\K3CloudResponseStatus.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\K3CloudResultInfo.cs" />
<Compile Include="Message\Response\KingDee\K3Result\Model\K3CloudSuccessEntity.cs" />
<Compile Include="Message\Response\LxmZHMDReport\ReportCalRateResp.cs" />
<Compile Include="Message\Response\Queue\QueueProcess.cs" />
<Compile Include="Message\Response\User\AdminLoginInfo.cs" />

2
Reportapi/MyCode.Project.OutSideService/IKingDeeService.cs
View File

@ -11,7 +11,7 @@ namespace MyCode.Project.OutSideService
/// <param name="formId"></param>
/// <param name="billSave"></param>
/// <returns></returns>
ResponseStatus Save(string formId, BillSave billSave);
K3CloudResponseStatus Save(string formId, BillSave billSave);
}

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

@ -91,7 +91,7 @@ namespace MyCode.Project.OutSideService.Implementation
/// <param name="formId"></param>
/// <param name="billSave"></param>
/// <returns></returns>
public ResponseStatus Save(string formId, BillSave billSave)
public K3CloudResponseStatus Save(string formId, BillSave billSave)
{
staClient = GetK3CloudClient();
var datastr = JsonHelper.ToJson(billSave, false, false, true);

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

@ -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<IOrderPushService>(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<WMSResponse>(resultContent);
if (result.Code != 200)
{
@ -287,14 +289,13 @@ namespace MyCode.Project.Services.Implementation
/// <param name="pushKingdeeOrder">源单信息</param>
/// <param name="param">门店配置</param>
/// <returns></returns>
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), // 含税单价等于 金额/总数