From 09cd61997d39a52a5b04dcfcae3abd92fb893b04 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Mon, 21 Jul 2025 17:25:29 +0800 Subject: [PATCH 1/2] 11 --- .../Model/YTKJTShopParameter.cs | 8 +++++ .../IServices/IJackYunStockinService.cs | 6 ++-- .../Implementation/JackYunStockinService.cs | 36 ++++++++++++------- .../Implementation/WMSService.cs | 22 +++++++----- .../Controllers/TestController.cs | 4 +-- 5 files changed, 50 insertions(+), 26 deletions(-) diff --git a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs index 7f9dfa9..856449d 100644 --- a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs +++ b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs @@ -197,5 +197,13 @@ namespace MyCode.Project.Domain.Model [SugarColumn(ColumnName="F_SALER")] public long? FSALER {get;set;} + /// + /// Desc:销售组织ID + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="F_SALE_ORGID")] + public int? FSALEORGID {get;set;} + } } diff --git a/Reportapi/MyCode.Project.Services/IServices/IJackYunStockinService.cs b/Reportapi/MyCode.Project.Services/IServices/IJackYunStockinService.cs index afd21c0..1603702 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IJackYunStockinService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IJackYunStockinService.cs @@ -14,18 +14,18 @@ namespace MyCode.Project.Services /// /// /// - void TaskSendInventoryMovement(DateTime now); + void TaskSendInventoryMovement(string sheet); /// /// 推送入库申请 /// /// - void SendInStock(DateTime now); + void SendInStock(string sheet); /// /// 推送出库申请 /// /// - void SendOutStock(DateTime now); + void SendOutStock(string sheet); } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs index 01bbaaa..d173c00 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunStockinService.cs @@ -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(strResponse); } - public void TaskSendInventoryMovement(DateTime now) + public void TaskSendInventoryMovement(string sheet) { - SendInStock(now); + SendInStock(sheet); - SendOutStock(now); + SendOutStock(sheet); } /// /// 上传入库数据 /// - 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); + }); } /// /// 上传出库数据 /// - 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); + }); } + + } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs index f64da29..3a94ee1 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/WMSService.cs @@ -103,13 +103,20 @@ namespace MyCode.Project.Services.Implementation if (trades.Count > 0) { _repository.Add(trades); - + string now = DateTime.Now.ToString(); + List inSheet = trades.Where(t => t.变动方向 == "+").Select(t => t.单据号).Distinct().ToList(); + inSheet.ForEach(t => + { + _workProcessService.Add(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", t, 1); + Thread.Sleep(500); + }); + inSheet = trades.Where(t => t.变动方向 != "+").Select(t => t.单据号).Distinct().ToList(); + inSheet.ForEach(t => + { + _workProcessService.Add(this.MerchantId, "SendOutStock", "上传WMS的出库数据到吉客云", t, 1); + Thread.Sleep(500); + }); } - string now = DateTime.Now.ToString(); - _workProcessService.Add(this.MerchantId, "SendInStock", "上传WMS的入库数据到吉客云", now, 1); - Thread.Sleep(500); - _workProcessService.Add(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(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1); - + _workProcessService.Add(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1); } #endregion } diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs index 4db7419..8668a39 100644 --- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs +++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs @@ -189,9 +189,9 @@ namespace MyCode.Project.WebApi.Controllers /// [HttpGet] [AllowAnonymous] - public void TaskSendJackYunInOrOutStock() + public void TaskSendJackYunInOrOutStock(string sheet) { - _jackYunStockinService.TaskSendInventoryMovement(DateTime.Now); + _jackYunStockinService.TaskSendInventoryMovement( sheet); } #endregion } From af2f97c50894882dafa9445b8c96143267734c2d Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Mon, 21 Jul 2025 17:53:44 +0800 Subject: [PATCH 2/2] 11 --- Reportapi/Documents/生产环境.config | 2 +- .../Model/JackOrdersItem.cs | 7 + .../Model/PushKingDeeOrderItem.cs | 7 + .../Model/YTKJTShopParameter.cs | 331 +++++++++--------- .../Implementation/OrderPushService.cs | 2 +- 5 files changed, 177 insertions(+), 172 deletions(-) diff --git a/Reportapi/Documents/生产环境.config b/Reportapi/Documents/生产环境.config index 0cf37cd..fe74e87 100644 --- a/Reportapi/Documents/生产环境.config +++ b/Reportapi/Documents/生产环境.config @@ -143,7 +143,7 @@ - + diff --git a/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs b/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs index 5b9cde2..22217fe 100644 --- a/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs +++ b/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs @@ -195,5 +195,12 @@ namespace MyCode.Project.Domain.Model /// public Guid? JackOrdersId {get;set;} + /// + /// Desc:计量单位 + /// Default: + /// Nullable:True + /// + public string Unit {get;set;} + } } diff --git a/Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs b/Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs index 201dd9d..45a5110 100644 --- a/Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs +++ b/Reportapi/MyCode.Project.Domain/Model/PushKingDeeOrderItem.cs @@ -78,5 +78,12 @@ namespace MyCode.Project.Domain.Model /// public Guid? PushKingDeeOrderId {get;set;} + /// + /// Desc:计量单位 + /// Default: + /// Nullable:True + /// + public string Unit {get;set;} + } } diff --git a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs index 680ec84..856449d 100644 --- a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs +++ b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs @@ -11,200 +11,191 @@ namespace MyCode.Project.Domain.Model [SugarTable("YTKJ_t_ShopParameter")] public partial class YTKJTShopParameter { - public YTKJTShopParameter() - { + public YTKJTShopParameter(){ - } - /// - /// Desc: - /// Default: - /// Nullable:False - /// - [SugarColumn(IsPrimaryKey = true)] - public long FID { get; set; } + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public long FID {get;set;} - /// - /// Desc: - /// Default: - /// Nullable:False - /// - public string FBILLNO { get; set; } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + public string FBILLNO {get;set;} - /// - /// Desc:审核状态 C=已审核 - /// Default: - /// Nullable:False - /// - public string FDOCUMENTSTATUS { get; set; } + /// + /// Desc:审核状态 C=已审核 + /// Default: + /// Nullable:False + /// + public string FDOCUMENTSTATUS {get;set;} - /// - /// Desc:门店编码 - /// Default: - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_SHOPCODE")] - public string FSHOPCODE { get; set; } + /// + /// Desc:门店编码 + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SHOPCODE")] + public string FSHOPCODE {get;set;} - /// - /// Desc:门店名称 - /// Default: - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_SHOPNAME")] - public string FSHOPNAME { get; set; } + /// + /// Desc:门店名称 + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SHOPNAME")] + public string FSHOPNAME {get;set;} - /// - /// Desc: - /// Default: - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_YTKJ_TEXT2")] - public string FYTKJTEXT2 { get; set; } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_YTKJ_TEXT2")] + public string FYTKJTEXT2 {get;set;} - /// - /// Desc:是否同步金蝶 - /// Default:1 - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_SYNCHRONIZEKINGDEE")] - public string FSYNCHRONIZEKINGDEE { get; set; } + /// + /// Desc:是否同步金蝶 + /// Default:1 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SYNCHRONIZEKINGDEE")] + public string FSYNCHRONIZEKINGDEE {get;set;} - /// - /// Desc:是否同步WMS - /// Default:1 - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_SYNCHRONIZEWMS")] - public string FSYNCHRONIZEWMS { get; set; } + /// + /// Desc:是否同步WMS + /// Default:1 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SYNCHRONIZEWMS")] + public string FSYNCHRONIZEWMS {get;set;} - /// - /// Desc:销售客户 - /// Default:0 - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_SALESCUSTOMERS")] - public int FSALESCUSTOMERS { get; set; } + /// + /// Desc:销售客户 + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SALESCUSTOMERS")] + public int FSALESCUSTOMERS {get;set;} - /// - /// Desc:发货仓库ID - /// Default:0 - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_WAREHOUSE")] - public int FWAREHOUSE { get; set; } + /// + /// Desc:发货仓库ID + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_WAREHOUSE")] + public int FWAREHOUSE {get;set;} - /// - /// Desc:仓库货主 - /// Default: - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_CANGKUHUOZHU")] - public string FCANGKUHUOZHU { get; set; } + /// + /// Desc:仓库货主 + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_CANGKUHUOZHU")] + public string FCANGKUHUOZHU {get;set;} - /// - /// Desc:公司ID - /// Default: - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_COMPANYID")] - public string FCOMPANYID { get; set; } + /// + /// Desc:公司ID + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_COMPANYID")] + public string FCOMPANYID {get;set;} - /// - /// Desc:发货大仓 - /// Default: - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_DACANG")] - public string FDACANG { get; set; } + /// + /// Desc:发货大仓 + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_DACANG")] + public string FDACANG {get;set;} - /// - /// Desc:税率 - /// Default:0 - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_TAXRATE")] - public decimal FTAXRATE { get; set; } + /// + /// Desc:税率 + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_TAXRATE")] + public decimal FTAXRATE {get;set;} - /// - /// Desc:创建日期 - /// Default: - /// Nullable:True - /// - [SugarColumn(ColumnName = "F_YTKJ_CREATEDATE")] - public DateTime? FYTKJCREATEDATE { get; set; } + /// + /// Desc:创建日期 + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="F_YTKJ_CREATEDATE")] + public DateTime? FYTKJCREATEDATE {get;set;} - /// - /// Desc:修改日期 - /// Default: - /// Nullable:True - /// - [SugarColumn(ColumnName = "F_YTKJ_MODIFYDATE")] - public DateTime? FYTKJMODIFYDATE { get; set; } + /// + /// Desc:修改日期 + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="F_YTKJ_MODIFYDATE")] + public DateTime? FYTKJMODIFYDATE {get;set;} - /// - /// Desc:审核日期 - /// Default: - /// Nullable:True - /// - [SugarColumn(ColumnName = "F_AUDITDATE")] - public DateTime? FAUDITDATE { get; set; } + /// + /// Desc:审核日期 + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="F_AUDITDATE")] + public DateTime? FAUDITDATE {get;set;} - /// - /// Desc:创建人 - /// Default:0 - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_YTKJ_CREATORID")] - public int FYTKJCREATORID { get; set; } + /// + /// Desc:创建人 + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_YTKJ_CREATORID")] + public int FYTKJCREATORID {get;set;} - /// - /// Desc:修改人 - /// Default:0 - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_YTKJ_MODIFIERID")] - public int FYTKJMODIFIERID { get; set; } + /// + /// Desc:修改人 + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_YTKJ_MODIFIERID")] + public int FYTKJMODIFIERID {get;set;} - /// - /// Desc:审核人 - /// Default:0 - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_AUDITOR")] - public int FAUDITOR { get; set; } + /// + /// Desc:审核人 + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_AUDITOR")] + public int FAUDITOR {get;set;} - /// - /// Desc:仓库编码 - /// Default: - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_WAREHOUSE_CODE")] - public string FWAREHOUSECODE { get; set; } + /// + /// Desc:仓库编码 + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_WAREHOUSE_CODE")] + public string FWAREHOUSECODE {get;set;} - /// - /// Desc:仓库名称 - /// Default: - /// Nullable:False - /// - [SugarColumn(ColumnName = "F_WAREHOUSE_NAME")] - public string FWAREHOUSENAME { get; set; } + /// + /// Desc:仓库名称 + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_WAREHOUSE_NAME")] + public string FWAREHOUSENAME {get;set;} - /// - /// Desc:销售员ID - /// Default: - /// Nullable:True - /// - [SugarColumn(ColumnName = "F_SALER")] - public long? FSALER { get; set; } - - /// - /// Desc:销售员ID - /// Default: - /// Nullable:True - /// - [SugarColumn(ColumnName = "F_SALE_ORGID")] - public long? FSaleOrgId { get; set; } + /// + /// Desc:销售员ID + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="F_SALER")] + public long? FSALER {get;set;} /// /// Desc:销售组织ID diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs index cc1cc1e..e810dc2 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs @@ -287,7 +287,7 @@ namespace MyCode.Project.Services.Implementation FDate = pushKingdeeOrder.ConsignTime?.ToString("yyyy/MM/dd"), FSaleOrgId = new FSaleOrgId() { - FOrgId = param.FSaleOrgId.ToString() // 销售组织 + FOrgId = param.FSALEORGID.ToString() // 销售组织 }, FCustId = new FCustomerId() {