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

11

Browse Source
This commit is contained in:
余宇波 2025-07-21 17:25:29 +08:00
parent 0cc51644b2
commit 09cd61997d
5 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
View File

@ -197,5 +197,13 @@ namespace MyCode.Project.Domain.Model
[SugarColumn(ColumnName="F_SALER")]
public long? FSALER {get;set;}
/// <summary>
/// Desc:销售组织ID
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="F_SALE_ORGID")]
public int? FSALEORGID {get;set;}
}
}

6
Reportapi/MyCode.Project.Services/IServices/IJackYunStockinService.cs
View File

@ -14,18 +14,18 @@ namespace MyCode.Project.Services
/// </summary>
/// <param name="now"></param>
/// <returns></returns>
void TaskSendInventoryMovement(DateTime now);
void TaskSendInventoryMovement(string sheet);
/// <summary>
/// 推送入库申请
/// </summary>
/// <param name="now"></param>
void SendInStock(DateTime now);
void SendInStock(string sheet);
/// <summary>
/// 推送出库申请
/// </summary>
/// <param name="now"></param>
void SendOutStock(DateTime now);
void SendOutStock(string sheet);
}
}

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

@ -2,6 +2,7 @@
using MyCode.Project.Domain.Repositories;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Infrastructure.Enumeration;
using MyCode.Project.Infrastructure.Exceptions;
using MyCode.Project.Infrastructure.JackYun;
using System;
using System.Collections.Generic;
@ -43,21 +44,21 @@ namespace MyCode.Project.Services.Implementation
return JsonHelper.ToObject<JackyunResponse>(strResponse);
}
public void TaskSendInventoryMovement(DateTime now)
public void TaskSendInventoryMovement(string sheet)
{
SendInStock(now);
SendInStock(sheet);
SendOutStock(now);
SendOutStock(sheet);
}
/// <summary>
/// 上传入库数据
/// </summary>
public void SendInStock(DateTime now)
public void SendInStock(string sheet)
{
var list = _wMStoJackyunInventoryMovementView1Repository.GetInventoryMovement();
//过滤入库数据
var InStockHead = list.Where(t => t.type == "+").Select(p => p.relDataId).Distinct().ToList();
var InStockHead = list.Where(t => t.type == "+" && t.relDataId == sheet).Select(p => p.relDataId).Distinct().ToList();
InStockHead.ForEach(relDataId =>
{
CreateAndStockinGetRequestBizData requestBizData = new CreateAndStockinGetRequestBizData();
@ -87,6 +88,8 @@ namespace MyCode.Project.Services.Implementation
LogHelper.Info("上传入库数据报文:"+lggl);
Thread.Sleep(500);
JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.CREATEANDSTOCKIN).Value, "1.0", requestBizData);
string ll = JsonHelper.ToJson(response);
LogHelper.Info("上传入库数据结果:" + ll);
//判断返回结果是否成功
if (response.code == "200")
{
@ -94,21 +97,23 @@ namespace MyCode.Project.Services.Implementation
}
else
{
_wMStoJackyunInventoryMovementView1Repository.UpdateStatus(3, relDataId);
//_wMStoJackyunInventoryMovementView1Repository.UpdateStatus(3, relDataId);
string msg = response.msg;
throw new BaseException(msg);
}
string ll = JsonHelper.ToJson(response);
LogHelper.Info("上传入库数据结果:"+ll);
});
}
/// <summary>
/// 上传出库数据
/// </summary>
public void SendOutStock(DateTime now)
public void SendOutStock(string sheet)
{
var list = _wMStoJackyunInventoryMovementView1Repository.GetInventoryMovement();
//过滤出库数据
var OutStockHead = list.Where(t => t.type != "+").Select(p => p.relDataId).Distinct().ToList();
var OutStockHead = list.Where(t => t.type != "+" && t.relDataId==sheet).Select(p => p.relDataId).Distinct().ToList();
OutStockHead.ForEach(relDataId =>
{
@ -139,6 +144,8 @@ namespace MyCode.Project.Services.Implementation
LogHelper.Info(lggl);
Thread.Sleep(500);
JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.CREATEANDSTOCKOUT).Value, "1.0", requestBizData);
string ll = JsonHelper.ToJson(response);
LogHelper.Info(ll);
//判断返回结果是否成功
if (response.code == "200")
{
@ -146,11 +153,14 @@ namespace MyCode.Project.Services.Implementation
}
else
{
_wMStoJackyunInventoryMovementView1Repository.UpdateStatus(3, relDataId);
string msg = response.msg;
throw new BaseException(msg);
//_wMStoJackyunInventoryMovementView1Repository.UpdateStatus(3, relDataId);
}
string ll = JsonHelper.ToJson(response);
LogHelper.Info(ll);
});
}
}
}

22
Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
View File

@ -103,13 +103,20 @@ namespace MyCode.Project.Services.Implementation
if (trades.Count > 0)
{
_repository.Add<WMStoJackyunInventoryMovementView1>(trades);
string now = DateTime.Now.ToString();
List<string> inSheet = trades.Where(t => t.变动方向 == "+").Select(t => t.单据号).Distinct().ToList();
inSheet.ForEach(t =>
{
_workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", t, 1);
Thread.Sleep(500);
});
inSheet = trades.Where(t => t.变动方向 != "+").Select(t => t.单据号).Distinct().ToList();
inSheet.ForEach(t =>
{
_workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendOutStock", "上传WMS的出库数据到吉客云", t, 1);
Thread.Sleep(500);
});
}
string now = DateTime.Now.ToString();
_workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", now, 1);
Thread.Sleep(500);
_workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendOutStock", "上传WMS的出库数据到吉客云", now, 1);
}
#endregion
@ -120,8 +127,7 @@ namespace MyCode.Project.Services.Implementation
public void AddMergeJackYunOrder()
{
string now = DateTime.Now.ToString();
_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);
_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);
}
#endregion
}

4
Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs
View File

@ -189,9 +189,9 @@ namespace MyCode.Project.WebApi.Controllers
/// </summary>
[HttpGet]
[AllowAnonymous]
public void TaskSendJackYunInOrOutStock()
public void TaskSendJackYunInOrOutStock(string sheet)
{
_jackYunStockinService.TaskSendInventoryMovement(DateTime.Now);
_jackYunStockinService.TaskSendInventoryMovement( sheet);
}
#endregion
}