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

1

Browse Source
This commit is contained in:
朱斌 2025-07-21 17:55:13 +08:00
commit 2885f33d33
9 changed files with 226 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Reportapi/Documents/生产环境.config
View File

@ -143,7 +143,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />

7
Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs
View File

@ -195,5 +195,12 @@ namespace MyCode.Project.Domain.Model
/// </summary>
public Guid? JackOrdersId {get;set;}
/// <summary>
/// Desc:计量单位
/// Default:
/// Nullable:True
/// </summary>
public string Unit {get;set;}
}
}

7
Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs
View File

@ -78,5 +78,12 @@ namespace MyCode.Project.Domain.Model
/// </summary>
public Guid? PushKingDeeOrderId {get;set;}
/// <summary>
/// Desc:计量单位
/// Default:
/// Nullable:True
/// </summary>
public string Unit {get;set;}
}
}

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

@ -11,8 +11,7 @@ namespace MyCode.Project.Domain.Model
[SugarTable("YTKJ_t_ShopParameter")]
public partial class YTKJTShopParameter
{
public YTKJTShopParameter()
{
public YTKJTShopParameter(){
}
@ -21,190 +20,190 @@ namespace MyCode.Project.Domain.Model
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public long FID { get; set; }
[SugarColumn(IsPrimaryKey=true)]
public long FID {get;set;}
/// <summary>
/// Desc:
/// Default:
/// Nullable:False
/// </summary>
public string FBILLNO { get; set; }
public string FBILLNO {get;set;}
/// <summary>
/// Desc:审核状态 C=已审核
/// Default:
/// Nullable:False
/// </summary>
public string FDOCUMENTSTATUS { get; set; }
public string FDOCUMENTSTATUS {get;set;}
/// <summary>
/// Desc:门店编码
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_SHOPCODE")]
public string FSHOPCODE { get; set; }
[SugarColumn(ColumnName="F_SHOPCODE")]
public string FSHOPCODE {get;set;}
/// <summary>
/// Desc:门店名称
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_SHOPNAME")]
public string FSHOPNAME { get; set; }
[SugarColumn(ColumnName="F_SHOPNAME")]
public string FSHOPNAME {get;set;}
/// <summary>
/// Desc:
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_YTKJ_TEXT2")]
public string FYTKJTEXT2 { get; set; }
[SugarColumn(ColumnName="F_YTKJ_TEXT2")]
public string FYTKJTEXT2 {get;set;}
/// <summary>
/// Desc:是否同步金蝶
/// Default:1
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_SYNCHRONIZEKINGDEE")]
public string FSYNCHRONIZEKINGDEE { get; set; }
[SugarColumn(ColumnName="F_SYNCHRONIZEKINGDEE")]
public string FSYNCHRONIZEKINGDEE {get;set;}
/// <summary>
/// Desc:是否同步WMS
/// Default:1
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_SYNCHRONIZEWMS")]
public string FSYNCHRONIZEWMS { get; set; }
[SugarColumn(ColumnName="F_SYNCHRONIZEWMS")]
public string FSYNCHRONIZEWMS {get;set;}
/// <summary>
/// Desc:销售客户
/// Default:0
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_SALESCUSTOMERS")]
public int FSALESCUSTOMERS { get; set; }
[SugarColumn(ColumnName="F_SALESCUSTOMERS")]
public int FSALESCUSTOMERS {get;set;}
/// <summary>
/// Desc:发货仓库ID
/// Default:0
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_WAREHOUSE")]
public int FWAREHOUSE { get; set; }
[SugarColumn(ColumnName="F_WAREHOUSE")]
public int FWAREHOUSE {get;set;}
/// <summary>
/// Desc:仓库货主
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_CANGKUHUOZHU")]
public string FCANGKUHUOZHU { get; set; }
[SugarColumn(ColumnName="F_CANGKUHUOZHU")]
public string FCANGKUHUOZHU {get;set;}
/// <summary>
/// Desc:公司ID
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_COMPANYID")]
public string FCOMPANYID { get; set; }
[SugarColumn(ColumnName="F_COMPANYID")]
public string FCOMPANYID {get;set;}
/// <summary>
/// Desc:发货大仓
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_DACANG")]
public string FDACANG { get; set; }
[SugarColumn(ColumnName="F_DACANG")]
public string FDACANG {get;set;}
/// <summary>
/// Desc:税率
/// Default:0
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_TAXRATE")]
public decimal FTAXRATE { get; set; }
[SugarColumn(ColumnName="F_TAXRATE")]
public decimal FTAXRATE {get;set;}
/// <summary>
/// Desc:创建日期
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "F_YTKJ_CREATEDATE")]
public DateTime? FYTKJCREATEDATE { get; set; }
[SugarColumn(ColumnName="F_YTKJ_CREATEDATE")]
public DateTime? FYTKJCREATEDATE {get;set;}
/// <summary>
/// Desc:修改日期
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "F_YTKJ_MODIFYDATE")]
public DateTime? FYTKJMODIFYDATE { get; set; }
[SugarColumn(ColumnName="F_YTKJ_MODIFYDATE")]
public DateTime? FYTKJMODIFYDATE {get;set;}
/// <summary>
/// Desc:审核日期
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "F_AUDITDATE")]
public DateTime? FAUDITDATE { get; set; }
[SugarColumn(ColumnName="F_AUDITDATE")]
public DateTime? FAUDITDATE {get;set;}
/// <summary>
/// Desc:创建人
/// Default:0
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_YTKJ_CREATORID")]
public int FYTKJCREATORID { get; set; }
[SugarColumn(ColumnName="F_YTKJ_CREATORID")]
public int FYTKJCREATORID {get;set;}
/// <summary>
/// Desc:修改人
/// Default:0
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_YTKJ_MODIFIERID")]
public int FYTKJMODIFIERID { get; set; }
[SugarColumn(ColumnName="F_YTKJ_MODIFIERID")]
public int FYTKJMODIFIERID {get;set;}
/// <summary>
/// Desc:审核人
/// Default:0
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_AUDITOR")]
public int FAUDITOR { get; set; }
[SugarColumn(ColumnName="F_AUDITOR")]
public int FAUDITOR {get;set;}
/// <summary>
/// Desc:仓库编码
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_WAREHOUSE_CODE")]
public string FWAREHOUSECODE { get; set; }
[SugarColumn(ColumnName="F_WAREHOUSE_CODE")]
public string FWAREHOUSECODE {get;set;}
/// <summary>
/// Desc:仓库名称
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "F_WAREHOUSE_NAME")]
public string FWAREHOUSENAME { get; set; }
[SugarColumn(ColumnName="F_WAREHOUSE_NAME")]
public string FWAREHOUSENAME {get;set;}
/// <summary>
/// Desc:销售员ID
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "F_SALER")]
public long? FSALER { get; set; }
[SugarColumn(ColumnName="F_SALER")]
public long? FSALER {get;set;}
/// <summary>
/// Desc:销售员ID
/// Desc:销售组织ID
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "F_SALE_ORGID")]
public int? FSaleOrgId { get; set; }
[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);
});
}
}
}

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

@ -300,8 +300,7 @@ namespace MyCode.Project.Services.Implementation
FDate = pushKingdeeOrder.ConsignTime?.ToString("yyyy/MM/dd"),
FSaleOrgId = new FSaleOrgId()
{
//FOrgId = param.FCOMPANYID // 销售组织
FOrgId = param.FSaleOrgId.ToString() // 销售组织
FOrgId = param.FSALEORGID.ToString() // 销售组织
},
FCustId = new FCustomerId()
{

18
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();
_workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", now, 1);
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);
_workProcessService.Add<IJackYunStockinService>(this.MerchantId, "SendOutStock", "上传WMS的出库数据到吉客云", now, 1);
});
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);
});
}
}
#endregion
@ -121,7 +128,6 @@ namespace MyCode.Project.Services.Implementation
{
string now = DateTime.Now.ToString();
_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
}