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
Download Patch File Download Diff File Expand all files Collapse all files

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), // 含税单价等于 金额/总数