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:
Administrator 2025-07-22 10:56:54 +08:00
commit 9530c0bba1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,16 +213,18 @@ namespace MyCode.Project.Services.Implementation
// 新建销售订单实例 // 新建销售订单实例
var order = new SaleOrder(); var order = new SaleOrder();
// 赋值 // 赋值
var orderNo = DateTimeOffset.Now.ToUnixTimeSeconds().ToString();
order.CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); order.CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
order.OrderTime = pushKingdeeOrder.CreateTime?.ToString("yyyy-MM-dd HH:mm:ss"); order.OrderTime = pushKingdeeOrder.CreateTime?.ToString("yyyy-MM-dd HH:mm:ss");
order.OrderNo = pushKingdeeOrder.Id.ToString(); order.OrderNo = orderNo;
//order.CompanyId = param.FCOMPANYID; // 公司Id //order.CompanyId = param.FCOMPANYID; // 公司Id
order.CompanyId = "TZ"; // 公司Id order.CompanyId = "TZ"; // 公司Id
order.OrderType = pushKingdeeOrder.TradeType == 8 ? "7" : "4"; // 订单类型 order.OrderType = pushKingdeeOrder.TradeType == 8 ? "PFTH" : "PFDD"; // 订单类型
order.CustomerId = param.FCANGKUHUOZHU; // 货主ID order.CustomerId = param.FCANGKUHUOZHU; // 货主ID
order.WarehouseId = pushKingdeeOrder?.WarehouseId; order.WarehouseId = pushKingdeeOrder?.WarehouseId;
order.OrderTime = pushKingdeeOrder.ConsignTime?.ToString("yyyy-MM-dd HH:mm:ss"); order.OrderTime = pushKingdeeOrder.ConsignTime?.ToString("yyyy-MM-dd HH:mm:ss");
order.Channel = "K3Cloud"; // 下发系统 order.Channel = "JeckYun"; // 下发系统
order.ItemType = pushKingdeeOrder.TradeType == 8 ? "退货订单" : "标准销售订单"; // 单据类型 order.ItemType = pushKingdeeOrder.TradeType == 8 ? "退货订单" : "标准销售订单"; // 单据类型
order.TotalQty = itemList.Sum(n => n.SellCount); order.TotalQty = itemList.Sum(n => n.SellCount);
order.TotalMount = itemList.Sum(n => n.SellTotal); order.TotalMount = itemList.Sum(n => n.SellTotal);
@ -230,7 +232,7 @@ namespace MyCode.Project.Services.Implementation
order.CustAccount = param.FSALESCUSTOMERS.ToString(); order.CustAccount = param.FSALESCUSTOMERS.ToString();
order.Lines = itemList.Select(n => new Line() order.Lines = itemList.Select(n => new Line()
{ {
OrderNo = pushKingdeeOrder.Id.ToString(), OrderNo = orderNo,
//CompanyId = param.FCOMPANYID, // 公司Id //CompanyId = param.FCOMPANYID, // 公司Id
CompanyId = "TZ", // 公司Id CompanyId = "TZ", // 公司Id
OrderType = pushKingdeeOrder.TradeType == 8 ? "7" : "4", // 订单类型 OrderType = pushKingdeeOrder.TradeType == 8 ? "7" : "4", // 订单类型
@ -249,7 +251,7 @@ namespace MyCode.Project.Services.Implementation
var uri = "http://172.16.42.45:9000"; var uri = "http://172.16.42.45:9000";
var requestString = JsonHelper.ToJson(order, false, true, true); var requestString = JsonHelper.ToJson(order, false, true, true);
var client = new RestClient($"{uri}/sale/order/out"); var client = new RestClient(pushKingdeeOrder.TradeType == 8 ? $"{uri}/sale/order/out" : $"{uri}/sale/order/reture");
client.Timeout = -1; client.Timeout = -1;
var request = new RestRequest(Method.POST); var request = new RestRequest(Method.POST);
request.AddHeader("Content-Type", "application/json"); request.AddHeader("Content-Type", "application/json");