From 2a99905ef376712a429136c9aa858d3745aa008c Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Tue, 16 Jul 2024 10:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CloneSplitPackingRec=E6=96=B9?= =?UTF-8?q?=E6=B3=95,=20=E5=88=A0=E9=99=A47=E4=B8=AA=E6=88=90=E5=91=98?= =?UTF-8?q?=EF=BC=8C=20=E6=B7=BB=E5=8A=A0BatchInsertTestAsync=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SplitPackings/Dtos/SplitPackingRecDto.cs | 31 +++--- .../ISplitPackingRecAppService.cs | 3 + .../Inputs/SplitPackingRecEditInput.cs | 35 +++--- .../SplitPackingRecAppService.cs | 11 +- .../Commons/PageHelper.cs | 28 +++++ .../SplitPackings/ISplitPackingRecManager.cs | 2 + .../SplitPackings/SplitPackingRec.cs | 28 +++-- .../SplitPackings/SplitPackingRecManager.cs | 105 ++++++++++++++++-- .../Win_in.Sfs.Basedata.Domain.csproj | 2 +- ...kingRecDbContextModelCreatingExtensions.cs | 4 +- .../InventoryLabelAppService.cs | 30 +++-- .../TransferNotes/TransferNoteAppService.cs | 14 +-- 12 files changed, 211 insertions(+), 82 deletions(-) create mode 100644 be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Commons/PageHelper.cs diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs index ff1e1c503..8a319a567 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs @@ -162,8 +162,6 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase - - #region InventoryLabel兼容成员 /// @@ -217,22 +215,22 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase /// /// 托标签号 /// - [Display(Name = "托标签号")] - public string ContainerCode { get; set; } + //[Display(Name = "托标签号")] + //public string ContainerCode { get; set; } #region 三个子实体成员 //-----------------------QualityInfo /// /// 质量级别 /// - [Display(Name = "质量级别")] - public string QLevel { get; set; } + //[Display(Name = "质量级别")] + //public string QLevel { get; set; } /// /// 质检文件 /// - [Display(Name = "质检文件")] - public string QualityFile { get; set; } + //[Display(Name = "质检文件")] + //public string QualityFile { get; set; } //----------------------PurchaseInfo /// @@ -263,28 +261,28 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase /// /// 生产线 /// - [Display(Name = "生产线")] - public string ProdLine { get; set; } + //[Display(Name = "生产线")] + //public string ProdLine { get; set; } /// /// 班组 /// - [Display(Name = "班组")] - public string Team { get; set; } + //[Display(Name = "班组")] + //public string Team { get; set; } /// /// 班次 /// - [Display(Name = "班次")] - public string Shift { get; set; } + //[Display(Name = "班次")] + //public string Shift { get; set; } #endregion /// /// 规格 /// - [Display(Name = "规格")] - public string Specifications { get; set; } + //[Display(Name = "规格")] + //public string Specifications { get; set; } /// /// 供应商名称 @@ -317,6 +315,5 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase [Required(ErrorMessage = "{0}是必填项")] public DateTime PlanArriveDate { get; set; } #endregion - } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/ISplitPackingRecAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/ISplitPackingRecAppService.cs index 4ba841877..a9273c5f6 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/ISplitPackingRecAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/ISplitPackingRecAppService.cs @@ -45,4 +45,7 @@ public interface ISplitPackingRecAppService /// Task CheckSplitNum(string fromPackCode, decimal inputQty); + Task BatchInsertTestAsync(List inputs); + + } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs index b12998e90..2b2b079ee 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs @@ -14,8 +14,8 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase //, IHasPurchaseInfoDto - , IHasProductionInfoDto - , IHasQualityInfoDto + //, IHasProductionInfoDto + //, IHasQualityInfoDto { /// /// 操作类型 @@ -170,8 +170,6 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase public EnumLabelType LabelType { get; set; } - - #region InventoryLabel兼容成员 /// @@ -225,22 +223,22 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase /// /// 托标签号 /// - [Display(Name = "托标签号")] - public string ContainerCode { get; set; } + //[Display(Name = "托标签号")] + //public string ContainerCode { get; set; } #region 三个子实体成员 //-----------------------QualityInfo /// /// 质量级别 /// - [Display(Name = "质量级别")] - public string QLevel { get; set; } + //[Display(Name = "质量级别")] + //public string QLevel { get; set; } /// /// 质检文件 /// - [Display(Name = "质检文件")] - public string QualityFile { get; set; } + //[Display(Name = "质检文件")] + //public string QualityFile { get; set; } //----------------------PurchaseInfo /// @@ -271,28 +269,28 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase /// /// 生产线 /// - [Display(Name = "生产线")] - public string ProdLine { get; set; } + //[Display(Name = "生产线")] + //public string ProdLine { get; set; } /// /// 班组 /// - [Display(Name = "班组")] - public string Team { get; set; } + //[Display(Name = "班组")] + //public string Team { get; set; } /// /// 班次 /// - [Display(Name = "班次")] - public string Shift { get; set; } + //[Display(Name = "班次")] + //public string Shift { get; set; } #endregion /// /// 规格 /// - [Display(Name = "规格")] - public string Specifications { get; set; } + //[Display(Name = "规格")] + //public string Specifications { get; set; } /// /// 供应商名称 @@ -325,5 +323,4 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase [Required(ErrorMessage = "{0}是必填项")] public DateTime PlanArriveDate { get; set; } #endregion - } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs index eb38d5d7c..9202fe372 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs @@ -8,6 +8,7 @@ using Win_in.Sfs.Basedata.Domain; using Win_in.Sfs.Basedata.Domain.Shared; using System.Linq; using Volo.Abp; +using Volo.Abp.Uow; namespace Win_in.Sfs.Basedata.Application; @@ -149,6 +150,12 @@ public class SplitPackingRecAppService : return overplusQty >= inputQty; } - - + [HttpPost("batch-insert-test")] + [UnitOfWork(IsDisabled =true)] + public async Task BatchInsertTestAsync(List inputs) + { + List lst = ObjectMapper.Map, List>(inputs); + bool ret = await _splitPackingRecManager.BatchInsertTestAsync(lst).ConfigureAwait(false); + return ret; + } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Commons/PageHelper.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Commons/PageHelper.cs new file mode 100644 index 000000000..fb75f54d2 --- /dev/null +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Commons/PageHelper.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Win_in.Sfs.Basedata.Commons; +public static class PageHelper +{ + // 计算总页数 + public static int GetTotalPages(int itemCount, int pageSize) + { + return (int)Math.Ceiling((double)itemCount / pageSize); + } + + // 获取特定页的数据 + public static List GetPage(List sourceList, int pageNumber, int pageSize) + { + if (pageNumber < 1 || pageSize < 1) + throw new ArgumentException("页数和每页大小必须大于零"); + + int startIndex = (pageNumber - 1) * pageSize; + int count = Math.Min(pageSize, sourceList.Count - startIndex); + + return sourceList.GetRange(startIndex, count); + } + +} diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/ISplitPackingRecManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/ISplitPackingRecManager.cs index 53a68d296..356fe260b 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/ISplitPackingRecManager.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/ISplitPackingRecManager.cs @@ -34,4 +34,6 @@ public interface ISplitPackingRecManager : IDomainService /// Task> GetAllByFromPackingCode(string fromPackingCode); + Task BatchInsertTestAsync(List input); + } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs index 7d6d6923e..e242354c1 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs @@ -148,8 +148,6 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase public EnumLabelType LabelType { get; set; } - - #region InventoryLabel兼容成员 /// @@ -195,7 +193,7 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase /// /// 托标签号 /// - public string ContainerCode { get; set; } + //public string ContainerCode { get; set; } /// /// 质量信息 @@ -205,14 +203,14 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase /// /// 质量等级 /// - [MaxLength(SfsEfCorePropertyConst.CodeLength)] - public string QLevel { get; set; } + //[MaxLength(SfsEfCorePropertyConst.CodeLength)] + //public string QLevel { get; set; } /// /// 质检文件 /// - [MaxLength(SfsEfCorePropertyConst.CodeLength)] - public string QualityFile { get; set; } + //[MaxLength(SfsEfCorePropertyConst.CodeLength)] + //public string QualityFile { get; set; } /// @@ -240,26 +238,26 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase /// /// 生产线 /// - [MaxLength(SfsEfCorePropertyConst.CodeLength)] - public string ProdLine { get; set; } + //[MaxLength(SfsEfCorePropertyConst.CodeLength)] + //public string ProdLine { get; set; } /// /// 班组 /// - [MaxLength(SfsEfCorePropertyConst.CodeLength)] - public string Team { get; set; } + //[MaxLength(SfsEfCorePropertyConst.CodeLength)] + //public string Team { get; set; } /// /// 班次 /// - [MaxLength(SfsEfCorePropertyConst.CodeLength)] - public string Shift { get; set; } + //[MaxLength(SfsEfCorePropertyConst.CodeLength)] + //public string Shift { get; set; } /// /// 规格 /// - [Display(Name = "规格")] - public string Specifications { get; set; } + //[Display(Name = "规格")] + //public string Specifications { get; set; } /// /// 供应商名称 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs index e47c930ec..b86ca0360 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs @@ -7,6 +7,7 @@ using Volo.Abp; using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Services; using Volo.Abp.ObjectMapping; +using Win_in.Sfs.Basedata.Commons; using Win_in.Sfs.Basedata.Domain.Shared; namespace Win_in.Sfs.Basedata.Domain; @@ -76,7 +77,8 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager if (hisLst3.ContainsKey(item.ToPackingCode) == false) { //SplitPackingRec newObj = CommonHelper.CloneObj(item); - SplitPackingRec newObj = ExpressionGenericMapper.Trans(item); + //SplitPackingRec newObj = ExpressionGenericMapper.Trans(item); + SplitPackingRec newObj = CloneSplitPackingRec(item); newObj.SetId(GuidGenerator.Create()); newObj.OprType = OprTypeEnum.Other; newObj.FromPackingCode = newObj.ToPackingCode; //克隆赋值 @@ -93,11 +95,12 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager //{ //} //SplitPackingRec newEntity = CommonHelper.CloneObj(item); - SplitPackingRec newEntity = ExpressionGenericMapper.Trans(item); + //SplitPackingRec newEntity = ExpressionGenericMapper.Trans(item); + SplitPackingRec newEntity = CloneSplitPackingRec(item); newEntity.SetId(GuidGenerator.Create()); - // var ret = await _repository.InsertAsync(newEntity, false).ConfigureAwait(false); - operLst.Add(newEntity); + // var ret = await _repository.InsertAsync(newEntity, false).ConfigureAwait(false); + operLst.Add(newEntity); } else @@ -108,19 +111,79 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager } if (item.ToTopPackingCode.IsNullOrEmpty()) { - item.ToTopPackingCode = item.FromPackingCode;// ToPackingCode; + item.ToTopPackingCode = item.FromPackingCode; } //SplitPackingRec newEntity = CommonHelper.CloneObj(item); - SplitPackingRec newEntity = ExpressionGenericMapper.Trans(item); + //SplitPackingRec newEntity = ExpressionGenericMapper.Trans(item); + SplitPackingRec newEntity = CloneSplitPackingRec(item); newEntity.SetId(GuidGenerator.Create()); //var ret = await _repository.InsertAsync(newEntity, false).ConfigureAwait(false); operLst.Add(newEntity); } } //foreach - await _repository.InsertManyAsync(operLst).ConfigureAwait(false); + bool autoSave = false; + await _repository.InsertManyAsync(operLst, autoSave).ConfigureAwait(false); return true; } + private static SplitPackingRec CloneSplitPackingRec(SplitPackingRec input) + { + SplitPackingRec entity = new SplitPackingRec(); + entity.OprType = input.OprType; + entity.FromPackingCode = input.FromPackingCode; + entity.FromTopPackingCode = input.FromTopPackingCode; + entity.FromStdPackQty = input.FromStdPackQty; + entity.FromUom = input.FromUom; + entity.FromQty = input.FromQty; + entity.ToPackingCode = input.ToPackingCode; + entity.ToTopPackingCode = input.ToTopPackingCode; + entity.ToStdPackQty = input.ToStdPackQty; + entity.ToUom = input.ToUom; + entity.ToQty = input.ToQty; + entity.ItemCode = input.ItemCode; + entity.ItemName = input.ItemName; + entity.ItemDesc1 = input.ItemDesc1; + entity.ItemDesc2 = input.ItemDesc2; + entity.FromLot = input.FromLot; + entity.ToLot = input.ToLot; + entity.PurchaseInfo_PoNumber = input.PurchaseInfo_PoNumber; + entity.PurchaseInfo_AsnNumber = input.PurchaseInfo_AsnNumber; + entity.ArrivalNoticNumber = input.ArrivalNoticNumber; + entity.TaskOrderNumber = input.TaskOrderNumber; + entity.ReceiptRecNumber = input.ReceiptRecNumber; + entity.PutOnShelfNumber = input.PutOnShelfNumber; + entity.LabelType = input.LabelType; + entity.CreationTime = input.CreationTime; + entity.CreatorId = input.CreatorId; + entity.LastModificationTime = input.LastModificationTime; + entity.LastModifierId = input.LastModifierId; + entity.Remark = input.Remark; + + entity.ArriveDate = input.ArriveDate; + //entity.ContainerCode = input.ContainerCode; + entity.ExpireDate = input.ExpireDate; + entity.FullBarcodeString = input.FullBarcodeString; + entity.LabelStatus = input.LabelStatus; + entity.LocationErpCode = input.LocationErpCode; + entity.PlanArriveDate = input.PlanArriveDate; + entity.ProduceDate = input.ProduceDate; + //entity.ProdLine = input.ProdLine; + //entity.Shift = input.Shift; + //entity.Team = input.Team; + entity.RpNumber = input.RpNumber; + entity.SupplierCode = input.SupplierCode; + //entity.QLevel = input.QLevel; + //entity.QualityFile = input.QualityFile; + entity.RecommendLocationCode = input.RecommendLocationCode; + //entity.Specifications = input.Specifications; + entity.SupplierBatch = input.SupplierBatch; + entity.SupplierItemCode = input.SupplierItemCode; + entity.SupplierItemName = input.SupplierItemName; + entity.SupplierName = input.SupplierName; + entity.SupplierSimpleName = input.SupplierSimpleName; + return entity; + } + /// /// 取每个目标箱码的最后一条拆箱记录 /// @@ -343,4 +406,32 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager return lst; } + public async Task BatchInsertTestAsync(List input) + { + List operLst = new List(); + var firstObj = input[0]; + int cnt = (int)(firstObj.FromStdPackQty); + for (int i = 1; i <= cnt; i++) + { + var newObj = CloneSplitPackingRec(firstObj); + newObj.SetId(this.GuidGenerator.Create()); + newObj.FromTopPackingCode = newObj.FromPackingCode; + newObj.ToTopPackingCode = newObj.ToPackingCode; + operLst.Add(newObj); + } + + //分页 + int pageSize = 50; + int pageTotal = PageHelper.GetTotalPages(operLst.Count, pageSize); + for (int i = 1; i <= pageTotal; i++) + { + var curPage = PageHelper.GetPage(operLst, i, pageSize); + bool autoSave = false; + await _repository.InsertManyAsync(curPage, autoSave).ConfigureAwait(false); + + } + return true; + } + + } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Win_in.Sfs.Basedata.Domain.csproj b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Win_in.Sfs.Basedata.Domain.csproj index 2011bcbb2..c8805ace5 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Win_in.Sfs.Basedata.Domain.csproj +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Win_in.Sfs.Basedata.Domain.csproj @@ -1,4 +1,4 @@ - + diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs index aa386ee6f..b41c214b0 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs @@ -51,8 +51,8 @@ public static class SplitPackingRecDbContextModelCreatingExtensions b.Property(q => q.SupplierBatch).HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.RecommendLocationCode).HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.LocationErpCode).HasMaxLength(SfsPropertyConst.CodeLength); - b.Property(q => q.ContainerCode).HasMaxLength(SfsPropertyConst.CodeLength); - b.Property(q => q.Specifications).HasMaxLength(SfsPropertyConst.CodeLength); + //b.Property(q => q.ContainerCode).HasMaxLength(SfsPropertyConst.CodeLength); + //b.Property(q => q.Specifications).HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.SupplierName).HasMaxLength(SfsPropertyConst.NameLength); b.Property(q => q.SupplierSimpleName).HasMaxLength(SfsPropertyConst.NameLength); b.Property(q => q.SupplierItemCode).HasMaxLength(SfsPropertyConst.CodeLength); diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs index 2da28546f..db2f45689 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs @@ -12,6 +12,7 @@ using Volo.Abp.Domain.Repositories; using Volo.Abp.ObjectMapping; using Volo.Abp.Uow; using Win_in.Sfs.Basedata.Application.Contracts; +using Win_in.Sfs.Basedata.Commons; using Win_in.Sfs.Basedata.Domain.Shared; using Win_in.Sfs.Label.Application.Contracts; using Win_in.Sfs.Label.Domain; @@ -205,17 +206,17 @@ public class InventoryLabelAppService packRec.LabelStatus = (Win_in.Sfs.Basedata.LabelStatus)((int)inputObj.LabelStatus); packRec.RecommendLocationCode = inputObj.RecommendLocationCode; packRec.LocationErpCode = inputObj.LocationErpCode; - packRec.ContainerCode = inputObj.ContainerCode; - packRec.QLevel = inputObj.QLevel;// - packRec.QualityFile = inputObj.QualityFile; + //packRec.ContainerCode = inputObj.ContainerCode; + //packRec.QLevel = inputObj.QLevel;// + //packRec.QualityFile = inputObj.QualityFile; packRec.SupplierCode = inputObj.SupplierCode; //packRec.PoNumber = inputObj.PoNumber; packRec.RpNumber = inputObj.RpNumber; //packRec.AsnNumber = inputObj.AsnNumber; - packRec.ProdLine = inputObj.ProdLine; - packRec.Team = inputObj.Team; - packRec.Shift = inputObj.Shift;// - packRec.Specifications = inputObj.Specifications; + //packRec.ProdLine = inputObj.ProdLine; + //packRec.Team = inputObj.Team; + //packRec.Shift = inputObj.Shift;// + //packRec.Specifications = inputObj.Specifications; packRec.SupplierName = inputObj.SupplierName; packRec.SupplierSimpleName = inputObj.SupplierSimpleName; packRec.SupplierItemCode = inputObj.SupplierItemCode; @@ -224,15 +225,20 @@ public class InventoryLabelAppService #endregion recLst.Add(packRec); } - bool bo = await _splitPackingRecAppService.BatchInsertAsync(recLst).ConfigureAwait(false); - if (bo == false) + int pageSize = 50; + int pageTotal = PageHelper.GetTotalPages(recLst.Count, pageSize); + for (int i = 1; i <= pageTotal; i++) { - throw new UserFriendlyException("调用插入拆箱记录表方法时返回假！"); - } + var curPage = PageHelper.GetPage(recLst, i, pageSize); + bool bo = await _splitPackingRecAppService.BatchInsertAsync(curPage).ConfigureAwait(false); + if (bo == false) + { + throw new UserFriendlyException("调用插入拆箱记录表方法时返回假！"); + } + } } - [HttpPost("generate-and-create")] [UnitOfWork] public virtual async Task GenerateAndCreateAsync(InventoryLabelWithoutCodeCreateInput input) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index 8c6fd11de..154c3813b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -486,17 +486,17 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase packRec.LabelStatus = (Win_in.Sfs.Basedata.LabelStatus)((int)inputObj.LabelStatus); packRec.RecommendLocationCode = inputObj.RecommendLocationCode; packRec.LocationErpCode = inputObj.LocationErpCode; - packRec.ContainerCode = inputObj.ContainerCode; - packRec.QLevel = inputObj.QLevel;// - packRec.QualityFile = inputObj.QualityFile; + //packRec.ContainerCode = inputObj.ContainerCode; + //packRec.QLevel = inputObj.QLevel;// + //packRec.QualityFile = inputObj.QualityFile; packRec.SupplierCode = inputObj.SupplierCode; packRec.PurchaseInfo_PoNumber = inputObj.PoNumber; packRec.RpNumber = inputObj.RpNumber; packRec.PurchaseInfo_AsnNumber = inputObj.AsnNumber; - packRec.ProdLine = inputObj.ProdLine; - packRec.Team = inputObj.Team; - packRec.Shift = inputObj.Shift;// - packRec.Specifications = inputObj.Specifications; + //packRec.ProdLine = inputObj.ProdLine; + //packRec.Team = inputObj.Team; + //packRec.Shift = inputObj.Shift;// + //packRec.Specifications = inputObj.Specifications; packRec.SupplierName = inputObj.SupplierName; packRec.SupplierSimpleName = inputObj.SupplierSimpleName; packRec.SupplierItemCode = inputObj.SupplierItemCode;