From 90772fdc9e21d8138f241fdff97c38d7ff8fd70b Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Wed, 8 May 2024 14:56:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntityFrameworkCore/ExChangeCenterDbContext.cs | 2 +- .../EntityFrameworkCore/WMSBJBMPTDbContext.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs index ca27f1e5..5e13c444 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs @@ -15,7 +15,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public ExChangeCenterDbContext(DbContextOptions options) : base(options) { - + this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(120)); } protected override void OnModelCreating(ModelBuilder modelBuilder) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs index e5d47f3c..2c691091 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs @@ -17,6 +17,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public WMSBJBMPTDbContext(DbContextOptions options) : base(options) { + this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(120)); } protected override void OnModelCreating(ModelBuilder modelBuilder) From c38f02a0c9795f047aae64992359f244bdc4b8f2 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 9 May 2024 15:47:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8BBUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/JobHostdService.cs | 4 ++-- .../Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs | 9 ++++++--- .../EntityFrameworkCore/ExChangeCenterDbContext.cs | 2 +- .../EntityFrameworkCore/SettleAccountDbContext.cs | 2 +- .../EntityFrameworkCore/WMSBJBMPTDbContext.cs | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs index 0717ef53..76d3e6b7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs @@ -140,8 +140,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { var jobItem = this.GetJobItem(job.Id); Guid? jobLogId = null; - // 如果作业正在运行并且心跳超过20秒，则停止作业 - if (jobItem.IsRunning && (DateTime.Now - jobItem.HeartBeat.Value).TotalSeconds > 20) + // 如果作业正在运行并且心跳超过120分钟，则停止作业 + if (jobItem.IsRunning && (DateTime.Now - jobItem.HeartBeat.Value).TotalMinutes > 120) { JobItemStop(jobItem.Id); } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs index f1a78c77..30f3d749 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using Coravel.Invocable; using EFCore.BulkExtensions; +using Hangfire.Common; using LinqToDB; using Microsoft.AspNetCore.Mvc; using SettleAccount.Domain.BQ; @@ -103,7 +105,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(10_000).ToList(); + .OrderBy(b => b.UID).Take(1_000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { @@ -121,7 +123,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs /// /// /// 同步TM_BJBMPT_JIS_RECORD表发运数据 - /// 同步十次、每次同步100_000条发运数据 + /// 同步十次、每次同步1_000条发运数据 /// private async Task SyncJisRecordAsync() { @@ -145,7 +147,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(10_000).ToList(); + .OrderBy(b => b.UID).Take(1_000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { @@ -201,6 +203,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs t.CreationTime = dateTimeNow; }); var syncPosition = seDetails.Last().UID.ToString(); + using var transaction = await _settleAccountDbContext.Database.BeginTransactionAsync().ConfigureAwait(false); try diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs index 5e13c444..103ec92e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs @@ -15,7 +15,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public ExChangeCenterDbContext(DbContextOptions options) : base(options) { - this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(120)); + this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder modelBuilder) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContext.cs index 8a07943f..bb3d7ad1 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContext.cs @@ -14,7 +14,7 @@ namespace Win.Sfs.SettleAccount public SettleAccountDbContext(DbContextOptions options) : base(options) { - this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(120)); + this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder builder) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs index 2c691091..2426c87e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs @@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public WMSBJBMPTDbContext(DbContextOptions options) : base(options) { - this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(120)); + this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder modelBuilder) From 3ff8bc8bbe7def5b8ae4684fd4b45954ec224f88 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 9 May 2024 17:09:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E8=B6=85=E6=97=B6=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/JobHostdService.cs | 2 +- .../Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs | 8 ++++---- .../EntityFrameworkCore/ExChangeCenterDbContext.cs | 2 +- .../EntityFrameworkCore/WMSBJBMPTDbContext.cs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs index 76d3e6b7..b6552572 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs @@ -140,7 +140,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { var jobItem = this.GetJobItem(job.Id); Guid? jobLogId = null; - // 如果作业正在运行并且心跳超过120分钟，则停止作业 + // 如果作业正在运行并且心跳超过20秒，则停止作业 if (jobItem.IsRunning && (DateTime.Now - jobItem.HeartBeat.Value).TotalMinutes > 120) { JobItemStop(jobItem.Id); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs index 30f3d749..721ed0e2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs @@ -94,7 +94,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs //业务类别 var businessType = SeSyncConfigInfo.BusinessType; var seed = 0; - while (seed < 10) + while (seed < 6) { seed++; var syncPositionFlag = await _settleAccountDbContext.Set().FirstOrDefaultAsync(t => t.TableName == syncTableName).ConfigureAwait(false); @@ -105,7 +105,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(1_000).ToList(); + .OrderBy(b => b.UID).Take(5000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { @@ -136,7 +136,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs //业务类别 var businessType = SeSyncConfigInfo.BusinessType; var seed = 0; - while (seed < 10) + while (seed < 6) { seed++; var syncPositionFlag = await _settleAccountDbContext.Set().FirstOrDefaultAsync(t => t.TableName == syncTableName).ConfigureAwait(false); @@ -147,7 +147,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(1_000).ToList(); + .OrderBy(b => b.UID).Take(5000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs index 103ec92e..6ef2dbb7 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs @@ -15,7 +15,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public ExChangeCenterDbContext(DbContextOptions options) : base(options) { - this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); + //this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder modelBuilder) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs index 2426c87e..4b1576fe 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs @@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public WMSBJBMPTDbContext(DbContextOptions options) : base(options) { - this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); + //this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder modelBuilder) From f21577a32e24d4790a945ca71593f7a4ea382ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Sun, 12 May 2024 20:28:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BQ/Syncs/MakeCanSettlementService.cs | 487 +++++++++++------- 1 file changed, 303 insertions(+), 184 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs index 3b40dcaf..d3403fdc 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs @@ -335,77 +335,118 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs var part_group_small = t1.Where(p => p.Amt < 10000000).ToList(); if (part_group_big.Count > 0) { - foreach (var itm in part_group_big) + var partlist = part_group_big.Select(p => p.LU).ToList(); + var ls = bbac_can_list.Where(p => partlist.Contains(p.LU)).ToList(); + var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + var bbac_sa = new BBAC_CAN_SA(); + bbac_sa.SetId(Guid.NewGuid()); + bbac_sa.BillNum = billNum; + bbac_sa.InvGroupNum = billNum; + bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + bbac_sa.State = SettleBillState.未结状态; + bbac_sa.SettleBillNum = string.Empty; + bbac_sa.Site = "1046"; + bbac_sa.BusinessType = EnumBusinessType.JisBBAC; + billList.Add(bbac_sa); + foreach (var itm1 in ls) { - var ls = bbac_can_list.Where(p => p.LU == itm.LU).ToList(); - decimal sum = 0; - List details = new List(); - foreach (var itm1 in ls) - { - sum += (itm1.Qty * itm1.Price); - if (sum > 10000000) - { - var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa = new BBAC_CAN_SA(); - bbac_sa.SetId(Guid.NewGuid()); - bbac_sa.BillNum = billNum; - bbac_sa.InvGroupNum = billNum; - bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa.State = SettleBillState.未结状态; - bbac_sa.SettleBillNum = string.Empty; - bbac_sa.Site = "1046"; - bbac_sa.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa); - foreach (var itm2 in details) - { - itm2.SetBillNum(billNum); - itm2.SetGroupNum(billNum); - billDetails.Add(itm2); - } - details = new List(); - sum = itm1.Qty * itm1.Price; - } - var _detailEntity = new BBAC_CAN_SA_DETAIL( - guid: GuidGenerator.Create(), - keyCode: itm1.KeyCode, - version: itm1.Version, - billNum: string.Empty, - settleBillNum: itm1.SettleBillNum, - lU: itm1.LU, - pN: itm1.PN, - site: itm1.Site, - qty: itm1.Qty, - price: itm1.Price, - category: itm1.BusinessType, - isReturn: itm1.IsReturn, - settleDate: itm1.SettleDate, - groupNum: itm1.GroupNum, - invGroupNum: string.Empty, - contactid: itm1.ContractDocID, - invbillnum: string.Empty, - partcode: itm1.PartCode - ); - _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - } - var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa1 = new BBAC_CAN_SA(); - bbac_sa1.SetId(Guid.NewGuid()); - bbac_sa1.BillNum = billNum1; - bbac_sa1.InvGroupNum = billNum1; - bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa1.State = SettleBillState.未结状态; - bbac_sa1.SettleBillNum = string.Empty; - bbac_sa1.Site = "1046"; - bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa1); - foreach (var detail in details) - { - detail.SetBillNum(billNum1); - detail.SetGroupNum(billNum1); - billDetails.Add(detail); - } + var _detailEntity = new BBAC_CAN_SA_DETAIL( + guid: GuidGenerator.Create(), + keyCode: itm1.KeyCode, + version: itm1.Version, + billNum: billNum, + settleBillNum: itm1.SettleBillNum, + lU: itm1.LU, + pN: itm1.PN, + site: itm1.Site, + qty: itm1.Qty, + price: itm1.Price, + category: itm1.BusinessType, + isReturn: itm1.IsReturn, + settleDate: itm1.SettleDate, + groupNum: itm1.GroupNum, + invGroupNum: billNum, + contactid: itm1.ContractDocID, + invbillnum: string.Empty, + partcode: itm1.PartCode + ); + _detailEntity.RealPartCode = itm1.RealPartCode; + billDetails.Add(_detailEntity); } + + + + //foreach (var itm in part_group_big) + //{ + // var ls = bbac_can_list.Where(p => p.LU == itm.LU).ToList(); + // decimal sum = 0; + // List details = new List(); + // foreach (var itm1 in ls) + // { + // sum += (itm1.Qty * itm1.Price); + // if (sum > 10000000) + // { + // var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa = new BBAC_CAN_SA(); + // bbac_sa.SetId(Guid.NewGuid()); + // bbac_sa.BillNum = billNum; + // bbac_sa.InvGroupNum = billNum; + // bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa.State = SettleBillState.未结状态; + // bbac_sa.SettleBillNum = string.Empty; + // bbac_sa.Site = "1046"; + // bbac_sa.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa); + // foreach (var itm2 in details) + // { + // itm2.SetBillNum(billNum); + // itm2.SetGroupNum(billNum); + // billDetails.Add(itm2); + // } + // details = new List(); + // sum = itm1.Qty * itm1.Price; + // } + // var _detailEntity = new BBAC_CAN_SA_DETAIL( + // guid: GuidGenerator.Create(), + // keyCode: itm1.KeyCode, + // version: itm1.Version, + // billNum: string.Empty, + // settleBillNum: itm1.SettleBillNum, + // lU: itm1.LU, + // pN: itm1.PN, + // site: itm1.Site, + // qty: itm1.Qty, + // price: itm1.Price, + // category: itm1.BusinessType, + // isReturn: itm1.IsReturn, + // settleDate: itm1.SettleDate, + // groupNum: itm1.GroupNum, + // invGroupNum: string.Empty, + // contactid: itm1.ContractDocID, + // invbillnum: string.Empty, + // partcode: itm1.PartCode + // ); + // _detailEntity.RealPartCode = itm1.RealPartCode; + // details.Add(_detailEntity); + // } + // var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa1 = new BBAC_CAN_SA(); + // bbac_sa1.SetId(Guid.NewGuid()); + // bbac_sa1.BillNum = billNum1; + // bbac_sa1.InvGroupNum = billNum1; + // bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa1.State = SettleBillState.未结状态; + // bbac_sa1.SettleBillNum = string.Empty; + // bbac_sa1.Site = "1046"; + // bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa1); + // foreach (var detail in details) + // { + // detail.SetBillNum(billNum1); + // detail.SetGroupNum(billNum1); + // billDetails.Add(detail); + // } + //} } if (part_group_small.Count > 0) { @@ -635,38 +676,24 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs var part_group_small = t1.Where(p => p.Amt < 10000000).ToList(); if (part_group_big.Count > 0) { - foreach (var itm in part_group_big) + + var partlist = part_group_big.Select(p => p.LU).ToList(); + var ls = hbpo_can_list.Where(p => partlist.Contains(p.LU)).ToList(); + var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + var hbpo_sa = new HBPO_CAN_SA(); + hbpo_sa.SetId(Guid.NewGuid()); + hbpo_sa.BillNum = billNum; + hbpo_sa.InvGroupNum = billNum; + hbpo_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + hbpo_sa.State = SettleBillState.未结状态; + hbpo_sa.SettleBillNum = string.Empty; + hbpo_sa.Site = "104T"; + hbpo_sa.BusinessType = EnumBusinessType.JisBBAC; + billList.Add(hbpo_sa); + foreach (var itm1 in ls) { - var ls = hbpo_can_list.Where(p => p.LU == itm.LU).ToList(); - decimal sum = 0; - List details = new List(); - foreach (var itm1 in ls) - { - sum += (itm1.Qty * itm1.Price); - if (sum > 10000000) - { - var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa = new HBPO_CAN_SA(); - bbac_sa.SetId(Guid.NewGuid()); - bbac_sa.BillNum = billNum; - bbac_sa.InvGroupNum = billNum; - bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa.State = SettleBillState.未结状态; - bbac_sa.SettleBillNum = string.Empty; - bbac_sa.Site = "104T"; - bbac_sa.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa); - foreach (var itm2 in details) - { - itm2.SetBillNum(billNum); - itm2.SetGroupNum(billNum); - billDetails.Add(itm2); - } - details = new List(); - sum = itm1.Qty * itm1.Price; - } - var _detailEntity = new HBPO_CAN_SA_DETAIL( - guid: GuidGenerator.Create(), + var _detailEntity = new HBPO_CAN_SA_DETAIL( + guid: GuidGenerator.Create(), keyCode: itm1.KeyCode, version: itm1.Version, billNum: string.Empty, @@ -682,100 +709,192 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs invGroupNum: string.Empty, invbillnum: string.Empty, partcode: itm1.PartCode - ); - _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - } - var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa1 = new HBPO_CAN_SA(); - bbac_sa1.SetId(Guid.NewGuid()); - bbac_sa1.BillNum = billNum1; - bbac_sa1.InvGroupNum = billNum1; - bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa1.State = SettleBillState.未结状态; - bbac_sa1.SettleBillNum = string.Empty; - bbac_sa1.Site = "104T"; - bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa1); - foreach (var detail in details) - { - detail.SetBillNum(billNum1); - detail.SetGroupNum(billNum1); - billDetails.Add(detail); - } + ); + _detailEntity.RealPartCode = itm1.RealPartCode; + billDetails.Add(_detailEntity); } + + + //foreach (var itm in part_group_big) + //{ + // var ls = hbpo_can_list.Where(p => p.LU == itm.LU).ToList(); + // decimal sum = 0; + // List details = new List(); + // foreach (var itm1 in ls) + // { + // sum += (itm1.Qty * itm1.Price); + // if (sum > 10000000) + // { + // var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa = new HBPO_CAN_SA(); + // bbac_sa.SetId(Guid.NewGuid()); + // bbac_sa.BillNum = billNum; + // bbac_sa.InvGroupNum = billNum; + // bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa.State = SettleBillState.未结状态; + // bbac_sa.SettleBillNum = string.Empty; + // bbac_sa.Site = "104T"; + // bbac_sa.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa); + // foreach (var itm2 in details) + // { + // itm2.SetBillNum(billNum); + // itm2.SetGroupNum(billNum); + // billDetails.Add(itm2); + // } + // details = new List(); + // sum = itm1.Qty * itm1.Price; + // } + // var _detailEntity = new HBPO_CAN_SA_DETAIL( + // guid: GuidGenerator.Create(), + // keyCode: itm1.KeyCode, + // version: itm1.Version, + // billNum: string.Empty, + // settleBillNum: itm1.SettleBillNum, + // lU: itm1.LU, + // pN: itm1.PN, + // site: itm1.Site, + // qty: itm1.Qty, + // price: itm1.Price, + // businessType: itm1.BusinessType, + // settleDate: itm1.SettleDate, + // groupNum: itm1.GroupNum, + // invGroupNum: string.Empty, + // invbillnum: string.Empty, + // partcode: itm1.PartCode + // ); + // _detailEntity.RealPartCode = itm1.RealPartCode; + // details.Add(_detailEntity); + // } + // var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa1 = new HBPO_CAN_SA(); + // bbac_sa1.SetId(Guid.NewGuid()); + // bbac_sa1.BillNum = billNum1; + // bbac_sa1.InvGroupNum = billNum1; + // bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa1.State = SettleBillState.未结状态; + // bbac_sa1.SettleBillNum = string.Empty; + // bbac_sa1.Site = "104T"; + // bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa1); + // foreach (var detail in details) + // { + // detail.SetBillNum(billNum1); + // detail.SetGroupNum(billNum1); + // billDetails.Add(detail); + // } + //} } if (part_group_small.Count > 0) { var partlist = part_group_small.Select(p => p.LU).ToList(); - var ls = hbpo_can_list.Where(p => partlist.Contains(p.LU)).ToList(); ; - decimal sum = 0; - List details = new List(); + var ls = hbpo_can_list.Where(p => partlist.Contains(p.LU)).ToList(); + var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + var hbpo_sa = new HBPO_CAN_SA(); + hbpo_sa.SetId(Guid.NewGuid()); + hbpo_sa.BillNum = billNum; + hbpo_sa.InvGroupNum = billNum; + hbpo_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + hbpo_sa.State = SettleBillState.未结状态; + hbpo_sa.SettleBillNum = string.Empty; + hbpo_sa.Site = "104T"; + hbpo_sa.BusinessType = EnumBusinessType.JisBBAC; + billList.Add(hbpo_sa); foreach (var itm1 in ls) { - sum += (itm1.Qty * itm1.Price); - if (sum > 10000000) - { - var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa = new HBPO_CAN_SA(); - bbac_sa.SetId(Guid.NewGuid()); - bbac_sa.BillNum = billNum; - bbac_sa.InvGroupNum = billNum; - bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa.State = SettleBillState.未结状态; - bbac_sa.SettleBillNum = string.Empty; - bbac_sa.Site = "104T"; - bbac_sa.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa); - foreach (var itm2 in details) - { - itm2.SetBillNum(billNum); - itm2.SetGroupNum(billNum); - billDetails.Add(itm2); - } - details = new List(); - sum = itm1.Qty * itm1.Price; - } var _detailEntity = new HBPO_CAN_SA_DETAIL( - guid: GuidGenerator.Create(), - keyCode: itm1.KeyCode, - version: itm1.Version, - billNum: string.Empty, - settleBillNum: itm1.SettleBillNum, - lU: itm1.LU, - pN: itm1.PN, - site: itm1.Site, - qty: itm1.Qty, - price: itm1.Price, - businessType: itm1.BusinessType, - - settleDate: itm1.SettleDate, - groupNum: itm1.GroupNum, - invGroupNum: string.Empty, - - invbillnum: string.Empty, - partcode: itm1.PartCode - ); + guid: GuidGenerator.Create(), + keyCode: itm1.KeyCode, + version: itm1.Version, + billNum: string.Empty, + settleBillNum: itm1.SettleBillNum, + lU: itm1.LU, + pN: itm1.PN, + site: itm1.Site, + qty: itm1.Qty, + price: itm1.Price, + businessType: itm1.BusinessType, + settleDate: itm1.SettleDate, + groupNum: itm1.GroupNum, + invGroupNum: string.Empty, + invbillnum: string.Empty, + partcode: itm1.PartCode + ); _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - } - var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); - var bbac_sa1 = new HBPO_CAN_SA(); - bbac_sa1.SetId(Guid.NewGuid()); - bbac_sa1.BillNum = billNum1; - bbac_sa1.InvGroupNum = billNum1; - bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); - bbac_sa1.State = SettleBillState.未结状态; - bbac_sa1.SettleBillNum = string.Empty; - bbac_sa1.Site = "104T"; - bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; - billList.Add(bbac_sa1); - foreach (var detail in details) - { - detail.SetBillNum(billNum1); - detail.SetGroupNum(billNum1); - billDetails.Add(detail); + billDetails.Add(_detailEntity); } + + + + //var partlist = part_group_small.Select(p => p.LU).ToList(); + //var ls = hbpo_can_list.Where(p => partlist.Contains(p.LU)).ToList(); ; + //decimal sum = 0; + //List details = new List(); + //foreach (var itm1 in ls) + //{ + // sum += (itm1.Qty * itm1.Price); + // if (sum > 10000000) + // { + // var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); + // var bbac_sa = new HBPO_CAN_SA(); + // bbac_sa.SetId(Guid.NewGuid()); + // bbac_sa.BillNum = billNum; + // bbac_sa.InvGroupNum = billNum; + // bbac_sa.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + // bbac_sa.State = SettleBillState.未结状态; + // bbac_sa.SettleBillNum = string.Empty; + // bbac_sa.Site = "104T"; + // bbac_sa.BusinessType = EnumBusinessType.JisBBAC; + // billList.Add(bbac_sa); + // foreach (var itm2 in details) + // { + // itm2.SetBillNum(billNum); + // itm2.SetGroupNum(billNum); + // billDetails.Add(itm2); + // } + // details = new List(); + // sum = itm1.Qty * itm1.Price; + // } + // var _detailEntity = new HBPO_CAN_SA_DETAIL( + // guid: GuidGenerator.Create(), + // keyCode: itm1.KeyCode, + // version: itm1.Version, + // billNum: string.Empty, + // settleBillNum: itm1.SettleBillNum, + // lU: itm1.LU, + // pN: itm1.PN, + // site: itm1.Site, + // qty: itm1.Qty, + // price: itm1.Price, + // businessType: itm1.BusinessType, + + // settleDate: itm1.SettleDate, + // groupNum: itm1.GroupNum, + // invGroupNum: string.Empty, + + // invbillnum: string.Empty, + // partcode: itm1.PartCode + // ); + // _detailEntity.RealPartCode = itm1.RealPartCode; + // details.Add(_detailEntity); + //} + //var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); + //var bbac_sa1 = new HBPO_CAN_SA(); + //bbac_sa1.SetId(Guid.NewGuid()); + //bbac_sa1.BillNum = billNum1; + //bbac_sa1.InvGroupNum = billNum1; + //bbac_sa1.Version = int.Parse(DateTime.Now.ToString("yyyyMM")); + //bbac_sa1.State = SettleBillState.未结状态; + //bbac_sa1.SettleBillNum = string.Empty; + //bbac_sa1.Site = "104T"; + //bbac_sa1.BusinessType = EnumBusinessType.JisBBAC; + //billList.Add(bbac_sa1); + //foreach (var detail in details) + //{ + // detail.SetBillNum(billNum1); + // detail.SetGroupNum(billNum1); + // billDetails.Add(detail); + //} } } } From b2fdc8306ffdda7817a23fed2acbfe036508f79e Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Mon, 13 May 2024 09:56:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs | 4 ++-- .../Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs | 8 ++++---- .../EntityFrameworkCore/ExChangeCenterDbContext.cs | 2 +- .../EntityFrameworkCore/WMSBJBMPTDbContext.cs | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs index 721ed0e2..b6663334 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs @@ -105,7 +105,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(5000).ToList(); + .OrderBy(b => b.UID).Take(5_000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { @@ -147,7 +147,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(5000).ToList(); + .OrderBy(b => b.UID).Take(5_000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs index bb102506..74ec1fd8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs @@ -93,7 +93,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs //业务类别 var businessType = SeSyncConfigInfo.BusinessType; var seed = 0; - while (seed < 10) + while (seed < 6) { seed++; var syncPositionFlag = await _settleAccountDbContext.Set().FirstOrDefaultAsync(t => t.TableName == syncTableName).ConfigureAwait(false); @@ -104,7 +104,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(10_000).ToList(); + .OrderBy(b => b.UID).Take(5_000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsSeRecords); if (jisSeDetails.Any()) { @@ -135,7 +135,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs //业务类别 var businessType = SeSyncConfigInfo.BusinessType; var seed = 0; - while (seed < 10) + while (seed < 6) { seed++; var syncPositionFlag = await _settleAccountDbContext.Set().FirstOrDefaultAsync(t => t.TableName == syncTableName).ConfigureAwait(false); @@ -146,7 +146,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs .Where(t => t.UID > int.Parse(syncPosition)) .Where(t => t.DeliverBillType == deliverBillType) .Where(t => deliverSubBillTypes.Contains(t.DeliverSubBillType)) - .OrderBy(b => b.UID).Take(10_000).ToList(); + .OrderBy(b => b.UID).Take(5_000).ToList(); var jisSeDetails = ObjectMapper.Map, List>(wmsRecords); if (jisSeDetails.Any()) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs index 6ef2dbb7..103ec92e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/ExChangeCenterDbContext.cs @@ -15,7 +15,7 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public ExChangeCenterDbContext(DbContextOptions options) : base(options) { - //this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); + this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder modelBuilder) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs index 4b1576fe..8f77b764 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSBJBMPTDbContext.cs @@ -11,13 +11,13 @@ namespace Win.Sfs.SettleAccount.EntityFrameworkCore public DbSet TM_BJBMPT_JIS_RECORD { get; set; } public DbSet TM_BJBMPT_OTHER_RECORD { get; set; } - public WMSBJBMPTDbContext() - { - } + //public WMSBJBMPTDbContext() + //{ + //} public WMSBJBMPTDbContext(DbContextOptions options) : base(options) { - //this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); + this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(50)); } protected override void OnModelCreating(ModelBuilder modelBuilder) From a19e37f2347e6b82108e8f771f8ed118fced909b Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Wed, 22 May 2024 09:22:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9MatchNumber=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs | 7 +++++++ .../Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs index b6663334..01faa33d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs @@ -201,6 +201,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs t.CreateTime = dateTimeNow; t.CreationTime = dateTimeNow; + + //如果MatchNumber为空，取MESConfigCode字段，MESConfigCode为老虚拟总成号 + if (string.IsNullOrEmpty(t.MatchNumber)) + { + t.MatchNumber = t.MESConfigCode; + } + }); var syncPosition = seDetails.Last().UID.ToString(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs index 74ec1fd8..0e21c57d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs @@ -201,6 +201,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs t.CreateTime = dateTimeNow; t.CreationTime = dateTimeNow; + + //如果MatchNumber为空，取MESConfigCode字段，MESConfigCode为老虚拟总成号 + if(string.IsNullOrEmpty(t.MatchNumber)) + { + t.MatchNumber = t.MESConfigCode; + } + }); var syncPosition = seDetails.Last().UID.ToString();