diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/Product.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/Product.cs index 44382eff3..c5243e47d 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/Product.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/Product.cs @@ -12,15 +12,15 @@ public class Product : Entity /// public string ERP { get; set; } /// - /// 零件号 + /// ERP料号 /// public string Code { get; set; } /// - /// 零件名 + /// 物品名 /// public string Name { get; set; } /// - /// 零件规格/颜色 + /// 物品规格/颜色 /// public string Model { get; set; } /// diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Issue/IssueNote.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Issue/IssueNote.cs index 6f4fa6e99..7973bfb88 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Issue/IssueNote.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Issue/IssueNote.cs @@ -15,7 +15,7 @@ public class IssueNote : Entity /// public string DeliverNumber { get; set; } /// - /// 物料号 + /// ERP料号 /// public string ItemCode { get; set; } /// diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/Boms/mes_bom.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/Boms/mes_bom.cs index ea76e1e14..66b227619 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/Boms/mes_bom.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/Boms/mes_bom.cs @@ -5,11 +5,11 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp; public class mes_bom : Entity { /// - /// 父物料号 + /// 父ERP料号 /// public string mes_bom_assy { get; set; } /// - /// 子物料号 + /// 子ERP料号 /// public string mes_bom_part { get; set; } /// diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ErpLocationItems/locdout.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ErpLocationItems/locdout.cs index 43eb811b2..6257e5234 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ErpLocationItems/locdout.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ErpLocationItems/locdout.cs @@ -13,7 +13,7 @@ public class locdout : Entity /// public string locdout_loc { get; set; } /// - /// 零件 + /// 物品 /// public string locdout_part { get; set; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/PurchasePrices/ismout.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/PurchasePrices/ismout.cs index 3c070a6f9..032c5f440 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/PurchasePrices/ismout.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/PurchasePrices/ismout.cs @@ -12,7 +12,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp; public class ismout : Entity { /// - /// 物料代码 + /// ERP料号 /// public string ismout_part { get; set; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/SalePrices/spriceout.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/SalePrices/spriceout.cs index d0bc15c7a..ecd197fe4 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/SalePrices/spriceout.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/SalePrices/spriceout.cs @@ -12,7 +12,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp; public class spriceout : Entity { /// - /// 物料代码 + /// ERP料号 /// public string spriceout_part { get; set; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scmsend.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scmsend.cs index 7f64898e8..963afc573 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scmsend.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scmsend.cs @@ -21,7 +21,7 @@ public class Scmsend : Entity /// public string scmsend_stat1 { get; set; } /// - /// 物料号 + /// ERP料号 /// public string scmsend_part { get; set; } /// diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs index 5b264c20c..d466900cd 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs @@ -522,7 +522,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming public string CargoID { get; set; } /// - /// 零件号 + /// ERP料号 /// [Newtonsoft.Json.JsonProperty("partCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string PartCode { get; set; } @@ -558,7 +558,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming public string CargoID { get; set; } /// - /// 零件号 + /// ERP料号 /// [Newtonsoft.Json.JsonProperty("partCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string PartCode { get; set; } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs index 47335b81c..3f742e1d0 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs @@ -135,7 +135,7 @@ public class InjectionMoldingRequestReader : IReader sw.Stop(); - //按区域、货位号、零件、标志 + //按区域、货位号、物品、标志 var group= camralist.GroupBy(r => new { r.AreaID, r.CargoID, r.PartCode, r.Flag }); //获取和次数相等的空闲数据 var list = group.Where(r => r.Count() == invterval).ToList(); @@ -164,7 +164,7 @@ public class InjectionMoldingRequestReader : IReader inputdetail.Add(jobrequestinput); } - var uncompletelist = await _injectionRequest.Getlist(inputdetail).ConfigureAwait(false);//将所有库位零件信息查找未完成记录 + var uncompletelist = await _injectionRequest.Getlist(inputdetail).ConfigureAwait(false);//将所有库位物品信息查找未完成记录 var query = from itm in list.Select(r => r.Key).ToList() join itm1 in uncompletelist on new { locCode = itm.AreaID.ToString(), itmCode = itm.PartCode, PositionCode = itm.CargoID.ToString() } @@ -210,7 +210,7 @@ public class InjectionMoldingRequestReader : IReader injectionRequestDetails.Add(detailInput); //} input.Details.AddRange(injectionRequestDetails); - // 通过 BindAsync 方法对零件仓库进行赋值 + // 通过 BindAsync 方法对物品仓库进行赋值 var errors = await BindAsync(input.Details).ConfigureAwait(false); if (errors.Count > 0) { @@ -278,22 +278,22 @@ public class InjectionMoldingRequestReader : IReader /// - /// 绑定零件库位信息，如果对错误返回错误新列表 + /// 绑定物品库位信息，如果对错误返回错误新列表 /// /// /// private async Task> BindAsync(List p_list) { - // 异步方法，将输入的请求绑定到对应的零件和库位信息，返回错误列表 + // 异步方法，将输入的请求绑定到对应的物品和库位信息，返回错误列表 List errors = new List(); foreach (var request in p_list) { - // 获取对应零件信息 + // 获取对应物品信息 var itm = await _itemService.GetByCodeAsync(request.ItemCode).ConfigureAwait(false); - if (itm == null) { errors.Add($"编号:{request.ItemCode}零件表中没找到,请维护零件表!"); } + if (itm == null) { errors.Add($"编号:{request.ItemCode}物品表中没找到,请维护物品表!"); } else { - // 更新请求中的零件描述和名称 + // 更新请求中的物品描述和名称 request.ItemDesc1 = itm.Desc1; request.ItemDesc2 = itm.Desc2; request.ItemName = itm.Name; @@ -377,11 +377,11 @@ public class InjectionMoldingRequestReader : IReader public class InjectionRequest { /// - /// 零件M + /// 物品M /// public string ItemCode { get; set; } /// - /// 零件名称 + /// 物品名称 /// public string ItemName { get; set; } /// diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs index da9ec43f5..61d9e21ce 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs @@ -103,7 +103,7 @@ public class BackFluConverter : IIncomingConverter var wmsBackDetail = _objectMapper.Map(back.Detail); list.Add(wmsBackDetail); } - var details = list.GroupBy(r =>new { r.ItemCode, r.LocationErpCode }).Select(p=> new BackFlushNoteDetailExchangeDto { ItemCode=p.Key.ItemCode,LocationErpCode=p.Key.LocationErpCode,Qty=p.Sum(item=>item.Qty)});//按零件汇总数量 + var details = list.GroupBy(r =>new { r.ItemCode, r.LocationErpCode }).Select(p=> new BackFlushNoteDetailExchangeDto { ItemCode=p.Key.ItemCode,LocationErpCode=p.Key.LocationErpCode,Qty=p.Sum(item=>item.Qty)});//按物品汇总数量 foreach (var detail in details.ToList()) { var wmsBackDetail = _objectMapper.Map(detail); diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs index 55f019b5b..df94183cf 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs @@ -153,7 +153,7 @@ public class MesOutConverter : IIncomingConverter } else { - //todo 这里不应该做完工 没有零件 + //todo 这里不应该做完工 没有物品 wmsProductReceiptNoteDetail.ItemName = ""; wmsProductReceiptNoteDetail.ItemDesc1 = ""; wmsProductReceiptNoteDetail.ItemDesc2 = ""; diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs index 958d8eeba..97782c728 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs @@ -85,7 +85,7 @@ public class MesOutReader : IReader incomingDataList.Add(incomingData); if (mesOut.Mesout_quality == "1") { - //查询零件对应的客户库位 + //查询物品对应的客户库位 string locationCode = await _customerItemAppService.GetFirstLocationCodeByItemCode(mesOut.Mesout_part).ConfigureAwait(false); if (!string.IsNullOrEmpty(locationCode)) { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs index 667e4a282..1f186a5c6 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs @@ -59,7 +59,7 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase common.updatedt = DateTime.Now; common.isupdate = false; - Logger.LogInformation($"Read ItemBasic");//零件 + Logger.LogInformation($"Read ItemBasic");//物品 var itemBasicReader = workerContext.ServiceProvider.GetRequiredService(); var itemBasicConverter = workerContext.ServiceProvider.GetRequiredService(); //读取并保存itemBasic @@ -127,7 +127,7 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase //转换Customer await CustomerConverter.ConvertAsync(customersFromExternalList).ConfigureAwait(false); - Logger.LogInformation($"Read ErpLocationItem");//储位与零件对应关系（开账） + Logger.LogInformation($"Read ErpLocationItem");//储位与物品对应关系（开账） var ErpLocationItemReader = workerContext.ServiceProvider.GetRequiredService(); var ErpLocationItemConverter = workerContext.ServiceProvider.GetRequiredService(); //读取并保存ErpLocationItem diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs index 5f225fa9e..57a863a47 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs @@ -40,7 +40,7 @@ public class ProductReceiptNoteConverter : IOutgoingConverter { string tyrpNumber = outgoingFromWms.TyrpNumber; var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); - int index=0;//为了处理相同number下存在相同零件号的问题。系统自动在number后添加index,如果只有一条明细就不添加。 + int index=0;//为了处理相同number下存在相同ERP料号的问题。系统自动在number后添加index,如果只有一条明细就不添加。 foreach (var detail in wmsReceipt.Details) { // string number = index > 0 ? wmsReceipt.Number + index.ToString() : wmsReceipt.Number; diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs index df1883ceb..242ad9343 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs @@ -49,7 +49,7 @@ public class ScontrolWriter : IWriter } try { - //零件号和ERP库位以及单据号相同则汇总 + //ERP料号和ERP库位以及单据号相同则汇总 //var groupScmsends= dataInterfaceDetailList.GroupBy(r => new { r.scmsend_type, r.scmsend_dt_w, r.scmsend_nbr, r.scmsend_stat1, r.scmsend_part, r.scmsend_delv_date, r.scmsend_orderno, r.scmsend_loc, r.scmsend_date, r.scmsend_wipd_loc, r.scmsend_userid }) // .Select(p=>new Scmsend { scmsend_type = p.Key.scmsend_type , scmsend_dt_w =p.Key.scmsend_dt_w , scmsend_nbr =p.Key.scmsend_nbr , scmsend_stat1 =p.Key.scmsend_stat1 , scmsend_part =p.Key.scmsend_part // , scmsend_delv_date =p.Key.scmsend_delv_date , scmsend_orderno =p.Key.scmsend_orderno , scmsend_loc =p.Key.scmsend_loc , scmsend_date=p.Key.scmsend_date, scmsend_wipd_loc = p.Key.scmsend_wipd_loc, diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/DTOs/MesProductL7PartsNoteDTO.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/DTOs/MesProductL7PartsNoteDTO.cs index 1e46dd89b..1aa24160f 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/DTOs/MesProductL7PartsNoteDTO.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/DTOs/MesProductL7PartsNoteDTO.cs @@ -55,9 +55,9 @@ public class MesProductL7PartsNoteDTO : SfsBasicDTOBase public string Configuration { get; set; } /// - /// L7零件号 + /// L7ERP料号 /// - [Display(Name = "L7零件号")] + [Display(Name = "L7ERP料号")] public string L7Part { get; set; } /// diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/MesProductL7PartsNoteCreateOrUpdateInputBase.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/MesProductL7PartsNoteCreateOrUpdateInputBase.cs index 7a92cfb0f..5da03b3f0 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/MesProductL7PartsNoteCreateOrUpdateInputBase.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/MesProductL7PartsNoteCreateOrUpdateInputBase.cs @@ -60,9 +60,9 @@ public class MesProductL7PartsNoteCreateOrUpdateInputBase : SfsDataExchangeCreat public string Configuration { get; set; } /// - /// L7零件 + /// L7物品 /// - [Display(Name = "L7零件")] + [Display(Name = "L7物品")] public string L7Part { get; set; } /// diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetDto.cs index a3baa53bd..7b124b9f1 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetDto.cs @@ -30,9 +30,9 @@ public class AsnDetDto : EntityDtoBase public virtual int PoLine { get; set; } /// - /// 物料号(Part number)(Part number) + /// ERP料号(Part number)(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetInput.cs index b82c54c70..47c003418 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetInput.cs @@ -34,9 +34,9 @@ public class AsnDetInput : EntityDto public virtual int PoLine { get; set; } /// - /// 物料号(Part number)(Part number) + /// ERP料号(Part number)(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required] public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomDto.cs index 1f0e9638f..475406388 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomDto.cs @@ -17,16 +17,16 @@ public class BomDto : EntityDtoBase public virtual string Company { get; set; } /// - /// 父物料号(Parent part number) + /// 父ERP料号(Parent part number) /// - [Display(Name = "父物料号(Parent part number)")] + [Display(Name = "父ERP料号(Parent part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string ParentCode { get; set; } /// - /// 子物料号(Component part number) + /// 子ERP料号(Component part number) /// - [Display(Name = "子物料号(Component part number)")] + [Display(Name = "子ERP料号(Component part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string ComponentCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomInput.cs index f075e86ee..5663c9fe1 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomInput.cs @@ -19,17 +19,17 @@ public class BomInput : EntityCreateInputBase, IEntityDto public virtual string Company { get; set; } /// - /// 父物料号(Parent part number) + /// 父ERP料号(Parent part number) /// - [Display(Name = "父物料号(Parent part number)")] + [Display(Name = "父ERP料号(Parent part number)")] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required] public virtual string ParentCode { get; set; } /// - /// 子物料号(Component part number) + /// 子ERP料号(Component part number) /// - [Display(Name = "子物料号(Component part number)")] + [Display(Name = "子ERP料号(Component part number)")] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required] public virtual string ComponentCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartDto.cs index 31eca1828..8b2c71728 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartDto.cs @@ -30,16 +30,16 @@ public class CustPartDto : EntityDtoBase public virtual string CustCode { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } /// - /// 客户物料号(Customer part number) + /// 客户ERP料号(Customer part number) /// - [Display(Name = "客户物料号(Customer part number)")] + [Display(Name = "客户ERP料号(Customer part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string CustPartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartInput.cs index 0b17250cc..2aa2e404e 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartInput.cs @@ -32,17 +32,17 @@ public class CustPartInput : EntityCreateInputBase public virtual string CustCode { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [Required] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } /// - /// 客户物料号(Customer part number) + /// 客户ERP料号(Customer part number) /// - [Display(Name = "客户物料号(Customer part number)")] + [Display(Name = "客户ERP料号(Customer part number)")] [Required] [StringLength(SfsEfCorePropertyConst.AddressLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string CustPartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryDto.cs index 01a7a3680..176ccf682 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryDto.cs @@ -23,9 +23,9 @@ public class InventoryDto : EntityDtoBase public virtual string Site { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryInput.cs index 77a2724ed..420296f01 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryInput.cs @@ -25,9 +25,9 @@ public class InventoryInput : EntityCreateInputBase public virtual string Site { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [Required] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartDto.cs index 7eecf56b8..cc337cb8e 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartDto.cs @@ -23,9 +23,9 @@ public class PartDto : EntityDtoBase public virtual string Site { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string Code { get; set; } @@ -91,30 +91,30 @@ public class PartDto : EntityDtoBase public virtual string ProdKind { get; set; } /// - /// 零件类型(Part type) + /// 物品类型(Part type) /// - [Display(Name = "零件类型(Part type)")] + [Display(Name = "物品类型(Part type)")] [StringLength(200, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartType { get; set; } /// - /// 零件种类(Part catalog) + /// 物品种类(Part catalog) /// - [Display(Name = "零件种类(Part catalog)")] + [Display(Name = "物品种类(Part catalog)")] [StringLength(200, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCatalog { get; set; } /// - /// 零件分组(Part group) + /// 物品分组(Part group) /// - [Display(Name = "零件分组(Part group)")] + [Display(Name = "物品分组(Part group)")] [StringLength(200, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartGroup { get; set; } /// - /// 虚零件 + /// 虚物品 /// - [Display(Name = "虚零件(Is phantom)")] + [Display(Name = "虚物品(Is phantom)")] public virtual bool IsPhantom { get; set; } /// diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartInput.cs index 603c28b43..4430f0482 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartInput.cs @@ -25,9 +25,9 @@ public class PartInput : EntityCreateInputBase public virtual string Site { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [Required] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string Code { get; set; } @@ -99,32 +99,32 @@ public class PartInput : EntityCreateInputBase public virtual string ProdKind { get; set; } /// - /// 零件类型(Part type) + /// 物品类型(Part type) /// - [Display(Name = "零件类型(Part type)")] + [Display(Name = "物品类型(Part type)")] [Required] [StringLength(SfsEfCorePropertyConst.ShortCodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartType { get; set; } /// - /// 零件种类(Part catalog) + /// 物品种类(Part catalog) /// - [Display(Name = "零件种类(Part catalog)")] + [Display(Name = "物品种类(Part catalog)")] [Required] [StringLength(SfsEfCorePropertyConst.ShortCodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCatalog { get; set; } /// - /// 零件分组(Part group) + /// 物品分组(Part group) /// - [Display(Name = "零件分组(Part group)")] + [Display(Name = "物品分组(Part group)")] [StringLength(SfsEfCorePropertyConst.ShortCodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartGroup { get; set; } /// - /// 虚零件 + /// 虚物品 /// - [Display(Name = "虚零件(Is phantom)")] + [Display(Name = "虚物品(Is phantom)")] public virtual bool IsPhantom { get; set; } /// diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetDto.cs index 4d0b61c30..8359e131f 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetDto.cs @@ -22,9 +22,9 @@ public class PoDetDto : EntityDtoBase public virtual int PoLine { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetInput.cs index c21491303..e9a7d9ddd 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetInput.cs @@ -25,9 +25,9 @@ public class PoDetInput : EntityDto public virtual int PoLine { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [Required] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistDto.cs index 593bfde2f..37470cfdf 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistDto.cs @@ -110,9 +110,9 @@ public class PrhHistDto : EntityDtoBase public virtual int Line { get; set; } /// - /// 零件号 + /// ERP料号 /// - [Display(Name = "零件号(Truck license plate number)")] + [Display(Name = "ERP料号(Truck license plate number)")] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required] public virtual string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistInput.cs index 7434bcba2..f9c3e4f4a 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistInput.cs @@ -111,9 +111,9 @@ public class PrhHistInput : EntityCreateInputBase, IEntityDto public virtual int Line { get; set; } /// - /// 零件号 + /// ERP料号 /// - [Display(Name = "零件号(Truck license plate number)")] + [Display(Name = "ERP料号(Truck license plate number)")] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required] public virtual string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineDto.cs index d5682e772..fb4ebc3c5 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineDto.cs @@ -38,9 +38,9 @@ public class ProdLineDto : EntityDtoBase public virtual string Desc { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineInput.cs index a64a41df8..4a7fe6c63 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineInput.cs @@ -41,9 +41,9 @@ public class ProdLineInput : EntityCreateInputBase public virtual string Desc { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [Required] [StringLength(SfsEfCorePropertyConst.AddressLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetDto.cs index b7da973b6..b67112d25 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetDto.cs @@ -15,9 +15,9 @@ public class ReceiptDetDto : EntityDtoBase public virtual int PoLine { get; set; } /// - /// 物料号(Part code) + /// ERP料号(Part code) /// - [Display(Name = "物料号(Part code)")] + [Display(Name = "ERP料号(Part code)")] public virtual string PartCode { get; set; } /// diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetInput.cs index af3b5a5e7..5e87ef0dc 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetInput.cs @@ -17,9 +17,9 @@ public class ReceiptDetInput : EntityDto public virtual int PoLine { get; set; } /// - /// 物料号(Part code) + /// ERP料号(Part code) /// - [Display(Name = "物料号(Part code)")] + [Display(Name = "ERP料号(Part code)")] [Required] public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetDto.cs index 7e21d97b6..c3194ad8c 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetDto.cs @@ -15,9 +15,9 @@ public class ReturnDetDto : EntityDtoBase public virtual int PoLine { get; set; } /// - /// 物料号(Part code) + /// ERP料号(Part code) /// - [Display(Name = "物料号(Part code)")] + [Display(Name = "ERP料号(Part code)")] public virtual string PartCode { get; set; } /// diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetInput.cs index 31000f7c1..20c5201ee 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetInput.cs @@ -18,9 +18,9 @@ public class ReturnDetInput : EntityDto public virtual int PoLine { get; set; } /// - /// 物料号(Part code) + /// ERP料号(Part code) /// - [Display(Name = "物料号(Part code)")] + [Display(Name = "ERP料号(Part code)")] [Required] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetDto.cs index 8597d5d56..c5b8bac59 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetDto.cs @@ -43,9 +43,9 @@ public class SodDetDto : EntityDtoBase public virtual string CustCode { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetInput.cs index 384427451..8cbcc9f37 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetInput.cs @@ -48,9 +48,9 @@ public class SodDetInput : EntityCreateInputBase public virtual string CustCode { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartDto.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartDto.cs index 9639e3880..2ab88500c 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartDto.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartDto.cs @@ -30,16 +30,16 @@ public class VendPartDto : EntityDtoBase public virtual string VendorCode { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } /// - /// 供应商物料号(Vendor part number) + /// 供应商ERP料号(Vendor part number) /// - [Display(Name = "供应商物料号(Vendor part number)")] + [Display(Name = "供应商ERP料号(Vendor part number)")] [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string VendPartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartInput.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartInput.cs index ca925155c..7be8b5760 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartInput.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartInput.cs @@ -33,17 +33,17 @@ public class VendPartInput : EntityCreateInputBase public virtual string VendorCode { get; set; } /// - /// 物料号(Part number) + /// ERP料号(Part number) /// - [Display(Name = "物料号(Part number)")] + [Display(Name = "ERP料号(Part number)")] [Required] [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string PartCode { get; set; } /// - /// 供应商物料号(Vendor part number) + /// 供应商ERP料号(Vendor part number) /// - [Display(Name = "供应商物料号(Vendor part number)")] + [Display(Name = "供应商ERP料号(Vendor part number)")] [Required] [StringLength(SfsEfCorePropertyConst.AddressLength, ErrorMessage = "{0}最多输入{1}个字符")] public virtual string VendPartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Mes/Mes/MesProductL7PartsNoteAppService.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Mes/Mes/MesProductL7PartsNoteAppService.cs index 09a8a8489..1c8b9a2af 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Mes/Mes/MesProductL7PartsNoteAppService.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Mes/Mes/MesProductL7PartsNoteAppService.cs @@ -36,7 +36,7 @@ public class MesProductL7PartsNoteAppService : return !(await _mesProductL7PartsNoteRepository.GetQueryableAsync().ConfigureAwait(false)).Any() ? 0 : - //转到实现，保存【L7级零件关系】 + //转到实现，保存【L7级物品关系】 (await _mesProductL7PartsNoteRepository.GetQueryableAsync().ConfigureAwait(false)).Max(p => p.RowID); } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/PrhHistAppService.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/PrhHistAppService.cs index ed5a658c7..ab0fc8e7d 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/PrhHistAppService.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/PrhHistAppService.cs @@ -65,7 +65,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService Validator.CheckSite(_configuration, entityObj.Site); Validator.CheckCompany(_configuration, entityObj.Company); - //获取零件的基本信息 + //获取物品的基本信息 ItemBasicDTO itemBasic = await _itemBasicAppService.GetByCodeAsync(input.Part).ConfigureAwait(false); string poNumber = entityObj.PoNumber; //收货单号 @@ -99,7 +99,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService //跟WMS不错处理，直接在DataExchange中记录错误 entityObj.ErrorCode = 9; - entityObj.ErrorMessage = $"该明细已经在WMS收货单中存在，收货单号为{poNumber}，行{line.ToString()}，箱码{entityObj.PackageNumber}，零件号{entityObj.Part}，批次{entityObj.Lot}"; + entityObj.ErrorMessage = $"该明细已经在WMS收货单中存在，收货单号为{poNumber}，行{line.ToString()}，箱码{entityObj.PackageNumber}，ERP料号{entityObj.Part}，批次{entityObj.Lot}"; //existNoteDetail.PoNumber = entityObj.PoNumber; //existNoteDetail.PoLine = entityObj.Line.ToString(); @@ -109,7 +109,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService //existNoteDetail.Item = new Shared.Domain.Item(); //existNoteDetail.Item =new Item(itemBasic.Id, itemBasic.Name, itemBasic.Desc1, itemBasic.Desc2); - ////part 零件号 Truck license plate number + ////part ERP料号 Truck license plate number //existNoteDetail.ItemCode = entityObj.Part; ////lot 批次 lot //existNoteDetail.Lot = entityObj.Lot; @@ -164,7 +164,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService detailInput.ItemDesc1 = itemBasic.Desc1; detailInput.ItemDesc2 = itemBasic.Desc2; - //part 零件号 Truck license plate number + //part ERP料号 Truck license plate number detailInput.ItemCode = entityObj.Part; //lot 批次 lot detailInput.Lot = entityObj.Lot; @@ -267,7 +267,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService detailInput.ItemDesc1 = itemBasic.Desc1; detailInput.ItemDesc2 = itemBasic.Desc2; - //part 零件号 Truck license plate number + //part ERP料号 Truck license plate number detailInput.ItemCode = entityObj.Part; //lot 批次 lot detailInput.Lot = entityObj.Lot; @@ -339,7 +339,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService //跟WMS不错处理，直接在DataExchange中记录错误 entityObj.ErrorCode = 9; - entityObj.ErrorMessage = $"该明细已经在WMS退货单中存在，单号为{poNumber}，行{line.ToString()}，箱码{entityObj.PackageNumber}，零件号{entityObj.Part}，批次{entityObj.Lot}"; + entityObj.ErrorMessage = $"该明细已经在WMS退货单中存在，单号为{poNumber}，行{line.ToString()}，箱码{entityObj.PackageNumber}，ERP料号{entityObj.Part}，批次{entityObj.Lot}"; #endregion } @@ -363,7 +363,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService detailInput.ItemDesc1 = itemBasic.Desc1; detailInput.ItemDesc2 = itemBasic.Desc2; - //part 零件号 Truck license plate number + //part ERP料号 Truck license plate number detailInput.ItemCode = entityObj.Part; //lot 批次 lot detailInput.Lot = entityObj.Lot; @@ -464,7 +464,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService detailInput.ItemDesc1 = itemBasic.Desc1; detailInput.ItemDesc2 = itemBasic.Desc2; - //part 零件号 Truck license plate number + //part ERP料号 Truck license plate number detailInput.ItemCode = entityObj.Part; //lot 批次 lot detailInput.Lot = entityObj.Lot; diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/SaleOrderAppService.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/SaleOrderAppService.cs index 397d62dcd..68bc34376 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/SaleOrderAppService.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/SaleOrderAppService.cs @@ -83,7 +83,7 @@ public class SaleOrderAppService : ApplicationService, ISaleOrderAppService detailObj.Qty = entityObj.Qty; //到货数量 //detailObj.Qty.Uom = ; //到货数量 detailObj.StdPackQty = entityObj.StdPackQty.TryToDecimalZero(); //标准包装 - detailObj.ItemCode = entityObj.PartCode; //物品代码 + detailObj.ItemCode = entityObj.PartCode; //ERP料号 //detailObj.Item.Name = ; //物品 targetObj.Details.Add(detailObj); diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNote.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNote.cs index 37f517c9f..1bb1a0eb8 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNote.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNote.cs @@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes.MesProductL7PartsNotes; /// -/// MesL7级零件对照关系 +/// MesL7级物品对照关系 /// public class MesProductL7PartsNote : SfsAggregateRootBase @@ -52,7 +52,7 @@ public class MesProductL7PartsNote : SfsAggregateRootBase public string Configuration { get; set; } /// - /// L7零件号 + /// L7ERP料号 /// public string L7Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNoteManager.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNoteManager.cs index 4259620d4..815b66d7b 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNoteManager.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNoteManager.cs @@ -25,7 +25,7 @@ public class MesProductL7PartsNoteManager : DomainService, IMesProductL7PartsNot ///// //public virtual async Task CreateAsync(List mesNotes) //{ - // //保存相关L7级零件单据 + // //保存相关L7级物品单据 // await _repository.InsertManyAsync(mesNotes); //} @@ -36,7 +36,7 @@ public class MesProductL7PartsNoteManager : DomainService, IMesProductL7PartsNot /// public async Task GetMaxRowIdAsync() { - //保存相关L7级零件单据 + //保存相关L7级物品单据 return await _repository.MaxAsync(p => p.RowID).ConfigureAwait(false); ; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/asn_mstrs/AsnDet.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/asn_mstrs/AsnDet.cs index 14937002b..3186d35a2 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/asn_mstrs/AsnDet.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/asn_mstrs/AsnDet.cs @@ -30,7 +30,7 @@ public class AsnDet : CreationAuditedEntity public virtual int PoLine { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/boms/bom.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/boms/bom.cs index 8cad3918f..3e5c9b37f 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/boms/bom.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/boms/bom.cs @@ -18,12 +18,12 @@ public class Bom : EntityBase public virtual string Company { get; set; } /// - /// 父物料号 + /// 父ERP料号 /// public virtual string Parent { get; set; } /// - /// 子物料号 + /// 子ERP料号 /// public virtual string Component { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/cust_parts/CustPart.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/cust_parts/CustPart.cs index 71c8a08c8..591e7e8fa 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/cust_parts/CustPart.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/cust_parts/CustPart.cs @@ -26,12 +26,12 @@ public class CustPart : EntityBase public virtual string CustCode { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string PartCode { get; set; } /// - /// 客户物料号 + /// 客户ERP料号 /// public virtual string CustPartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/inventorys/inventory.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/inventorys/inventory.cs index dbdc67693..51ddfd97f 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/inventorys/inventory.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/inventorys/inventory.cs @@ -21,7 +21,7 @@ public class Inventory : EntityBase public virtual string Site { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/parts/part.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/parts/part.cs index bf5afeda0..6fb17b871 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/parts/part.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/parts/part.cs @@ -21,7 +21,7 @@ public class Part : EntityBase public virtual string Site { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string Code { get; set; } @@ -71,22 +71,22 @@ public class Part : EntityBase public virtual string ProdKind { get; set; } /// - /// 零件类型 + /// 物品类型 /// public virtual string PartType { get; set; } /// - /// 零件种类 + /// 物品种类 /// public virtual string PartCatalog { get; set; } /// - /// 零件分组 + /// 物品分组 /// public virtual string PartGroup { get; set; } /// - /// 虚零件 + /// 虚物品 /// public virtual bool IsPhantom { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/po_mstrs/PoDet.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/po_mstrs/PoDet.cs index 2362b6879..190f385fb 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/po_mstrs/PoDet.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/po_mstrs/PoDet.cs @@ -24,7 +24,7 @@ public class PoDet : CreationAuditedEntity public virtual int PoLine { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prh_hists/PrhHist.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prh_hists/PrhHist.cs index 833c2626b..8c1a61324 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prh_hists/PrhHist.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prh_hists/PrhHist.cs @@ -78,7 +78,7 @@ public class PrhHist : EntityBase public int Line { get; set; } /// - /// 零件号 + /// ERP料号 /// public string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prod_lines/ProdLine.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prod_lines/ProdLine.cs index 2bfc737e0..6ac99dbf1 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prod_lines/ProdLine.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prod_lines/ProdLine.cs @@ -32,7 +32,7 @@ public class ProdLine : EntityBase public virtual string Desc { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string Part { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/receipts/ReceiptDet.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/receipts/ReceiptDet.cs index 065297eb0..d8a25509c 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/receipts/ReceiptDet.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/receipts/ReceiptDet.cs @@ -21,7 +21,7 @@ public class ReceiptDet : CreationAuditedEntity public virtual int PoLine { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/returns/ReturnDet.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/returns/ReturnDet.cs index b8491aeb3..3ed933eec 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/returns/ReturnDet.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/returns/ReturnDet.cs @@ -21,7 +21,7 @@ public class ReturnDet : CreationAuditedEntity public virtual int PoLine { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/sod_dets/SodDet.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/sod_dets/SodDet.cs index 2c8a3a6ac..476b71e6b 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/sod_dets/SodDet.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/sod_dets/SodDet.cs @@ -36,7 +36,7 @@ public class SodDet : EntityBase public virtual string CustCode { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string PartCode { get; set; } diff --git a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/vend_parts/VendPart.cs b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/vend_parts/VendPart.cs index b5360ecf0..455491e44 100644 --- a/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/vend_parts/VendPart.cs +++ b/be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/vend_parts/VendPart.cs @@ -26,12 +26,12 @@ public class VendPart : EntityBase public virtual string VendorCode { get; set; } /// - /// 物料号 + /// ERP料号 /// public virtual string PartCode { get; set; } /// - /// 供应商物料号 + /// 供应商ERP料号 /// public virtual string VendPartCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteDetailExchangeDto.cs index f0e5ef8b2..691c3fd20 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteDetailExchangeDto.cs @@ -12,9 +12,9 @@ public class BackFlushNoteDetailExchangeDto [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// ERP库位 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteExchangeDto.cs index 5f93541af..2b5dc6b20 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteExchangeDto.cs @@ -15,9 +15,9 @@ public class BackFlushNoteExchangeDto public string Worker { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/Bom/BomExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/Bom/BomExchangeDto.cs index e13dc95d6..ef0a2f945 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/Bom/BomExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/Bom/BomExchangeDto.cs @@ -7,16 +7,16 @@ namespace Win_in.Sfs.Wms.DataExchange.WMS.Bom; public class BomExchangeDto { /// - /// 父物料号 + /// 父ERP料号 /// - [Display(Name = "父物料号")] + [Display(Name = "父ERP料号")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Product { get; set; } /// - /// 子物料号 + /// 子ERP料号 /// - [Display(Name = "子物料号")] + [Display(Name = "子ERP料号")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Component { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CountAdjustNote/CountAdjustNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CountAdjustNote/CountAdjustNoteDetailExchangeDto.cs index 2f85e4307..5d471e671 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CountAdjustNote/CountAdjustNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CountAdjustNote/CountAdjustNoteDetailExchangeDto.cs @@ -5,9 +5,9 @@ namespace Win_in.Sfs.Wms.DataExchange.WMS.CountAdjustNote; public class CountAdjustNoteDetailExchangeDto { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// ERP库位 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CustomerReturnNote/CustomerReturnNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CustomerReturnNote/CustomerReturnNoteDetailExchangeDto.cs index a0cbc75ad..817961ec6 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CustomerReturnNote/CustomerReturnNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CustomerReturnNote/CustomerReturnNoteDetailExchangeDto.cs @@ -22,8 +22,8 @@ public class CustomerReturnNoteDetailExchangeDto public decimal Qty { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteDetailExchangeDto.cs index e0b3bb7d6..cda6687aa 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteDetailExchangeDto.cs @@ -12,9 +12,9 @@ public class DeliverNoteDetailExchangeDto [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// 来源ERP库位 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverRequest/DeliverRequestDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverRequest/DeliverRequestDetailExchangeDto.cs index f46e0d787..3f76b5d9b 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverRequest/DeliverRequestDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverRequest/DeliverRequestDetailExchangeDto.cs @@ -11,9 +11,9 @@ public class DeliverRequestDetailExchangeDto [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// 来源库区 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ErpLocationItem/ErpLocationItem.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ErpLocationItem/ErpLocationItem.cs index 79115255e..180e65e2b 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ErpLocationItem/ErpLocationItem.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ErpLocationItem/ErpLocationItem.cs @@ -14,9 +14,9 @@ public class ErpLocationItemExchangeDto public string ErpLocationCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/InjectionIssueRequest/InjectionIssueRequestDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/InjectionIssueRequest/InjectionIssueRequestDetailExchangeDto.cs index 273fcf2f5..d2911911b 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/InjectionIssueRequest/InjectionIssueRequestDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/InjectionIssueRequest/InjectionIssueRequestDetailExchangeDto.cs @@ -22,9 +22,9 @@ public class InjectionIssueRequestDetailExchangeDto public decimal BoxQty { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/IssueNote/IssueNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/IssueNote/IssueNoteDetailExchangeDto.cs index e933401aa..3217865c6 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/IssueNote/IssueNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/IssueNote/IssueNoteDetailExchangeDto.cs @@ -26,9 +26,9 @@ public class IssueNoteDetailExchangeDto public decimal Qty { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs index 3cd336fec..4c0095314 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs @@ -10,9 +10,9 @@ public class ItemPackExchangeDto [Display(Name = "供应商编号")] public string SupplierCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// @@ -27,10 +27,10 @@ public class ItemPackExchangeDto [Display(Name = "包装名称")] public string PackName { get; set; } /// - /// 零件规格/颜色 + /// 物品规格/颜色 /// - [Display(Name = "零件规格/颜色")] + [Display(Name = "物品规格/颜色")] public string Remark { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MaterialRequest/MaterialRequestDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MaterialRequest/MaterialRequestDetailExchangeDto.cs index 05ce5e19b..c7f6374de 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MaterialRequest/MaterialRequestDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MaterialRequest/MaterialRequestDetailExchangeDto.cs @@ -26,9 +26,9 @@ public class MaterialRequestDetailExchangeDto public decimal Qty { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MesNote/MesNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MesNote/MesNoteDetailExchangeDto.cs index 4283d490f..f91c1803b 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MesNote/MesNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MesNote/MesNoteDetailExchangeDto.cs @@ -11,9 +11,9 @@ public class MesNoteDetailExchangeDto [Display(Name = "移库单号")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteDetailExchangeDto.cs index fe2722182..cad7aef2b 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteDetailExchangeDto.cs @@ -45,9 +45,9 @@ public class ProductReceiptNoteDetailExchangeDto [Display(Name = "Erp储位")] public string LocationErpCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteSumDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteSumDetailExchangeDto.cs index d9a1e8cc4..2bbfe1a4a 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteSumDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteSumDetailExchangeDto.cs @@ -10,14 +10,14 @@ namespace Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote; public class ProductReceiptNoteSumDetailExchangeDto { /// - /// 零件编号 + /// 物品编号 /// - [Display(Name = "零件编号")] + [Display(Name = "物品编号")] public string itemCode { get; set; } /// /// 库位编码 /// - [Display(Name = "零件编号")] + [Display(Name = "物品编号")] public string locationCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleMaterialDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleMaterialDetailExchangeDto.cs index c675f63f0..544344dd4 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleMaterialDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleMaterialDetailExchangeDto.cs @@ -5,9 +5,9 @@ namespace Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote; public class ProductRecycleMaterialDetailExchangeDto { /// - /// 产成品物料号 + /// 产成品ERP料号 /// - [Display(Name = "产成品物料号")] + [Display(Name = "产成品ERP料号")] public string ProductItemCode { get; set; } /// @@ -23,9 +23,9 @@ public class ProductRecycleMaterialDetailExchangeDto public string LocationErpCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteDetailExchangeDto.cs index 73884c82e..88f7898a6 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteDetailExchangeDto.cs @@ -10,9 +10,9 @@ public class ProductRecycleNoteDetailExchangeDto [Display(Name = "数量")] public decimal Qty { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteExchangeDto.cs index b33275e77..7741d5f6e 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteExchangeDto.cs @@ -22,9 +22,9 @@ public class ProductRecycleNoteExchangeDto public DateTime ActiveDate { get; set; } = DateTime.Now.Date; /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductionReturnNote/ProductionReturnNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductionReturnNote/ProductionReturnNoteDetailExchangeDto.cs index 5b56f4831..07f4c3485 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductionReturnNote/ProductionReturnNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductionReturnNote/ProductionReturnNoteDetailExchangeDto.cs @@ -10,9 +10,9 @@ public class ProductionReturnNoteDetailExchangeDto [Display(Name = "上架单号")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs index d6b6be50d..294397d7e 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs @@ -22,9 +22,9 @@ public class PurchaseOrderDetailExchangeDto public string ProjectCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchasePrice/PurchasePriceExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchasePrice/PurchasePriceExchangeDto.cs index 423d484e2..4415b9405 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchasePrice/PurchasePriceExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchasePrice/PurchasePriceExchangeDto.cs @@ -7,10 +7,10 @@ namespace Win_in.Sfs.Wms.DataExchange.WMS.PurchasePrice; public class PurchasePriceExchangeDto { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReceipt/PurchaseReceiptNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReceipt/PurchaseReceiptNoteDetailExchangeDto.cs index 1f0bd04b3..d968a7e96 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReceipt/PurchaseReceiptNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReceipt/PurchaseReceiptNoteDetailExchangeDto.cs @@ -90,9 +90,9 @@ public class PurchaseReceiptNoteDetailExchangeDto // public DateTime ExpireDate { get; set; } = DateTime.MaxValue; /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } [Display(Name = "备注")] diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReturn/PurchaseReturnNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReturn/PurchaseReturnNoteDetailExchangeDto.cs index dac415e5b..0de1d2c78 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReturn/PurchaseReturnNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReturn/PurchaseReturnNoteDetailExchangeDto.cs @@ -108,9 +108,9 @@ public class PurchaseReturnNoteDetailExchangeDto // public DateTime ExpireDate { get; set; } = DateTime.MaxValue; /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } [Display(Name = "备注")] diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PutawayNote/PutawayNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PutawayNote/PutawayNoteDetailExchangeDto.cs index 78740f34c..6d68c52a4 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PutawayNote/PutawayNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PutawayNote/PutawayNoteDetailExchangeDto.cs @@ -16,9 +16,9 @@ public class PutawayNoteDetailExchangeDto [Display(Name = "订单号")] public string PoNumber { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/RecycledMaterialReceiptNote/RecycledMaterialReceiptNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/RecycledMaterialReceiptNote/RecycledMaterialReceiptNoteDetailExchangeDto.cs index 8de1ace7c..843f96edf 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/RecycledMaterialReceiptNote/RecycledMaterialReceiptNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/RecycledMaterialReceiptNote/RecycledMaterialReceiptNoteDetailExchangeDto.cs @@ -12,9 +12,9 @@ public class RecycledMaterialReceiptNoteDetailExchangeDto [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// Erp储位 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SalePrice/SalePriceExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SalePrice/SalePriceExchangeDto.cs index b422a5408..f21c9a3a2 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SalePrice/SalePriceExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SalePrice/SalePriceExchangeDto.cs @@ -13,10 +13,10 @@ namespace Win_in.Sfs.Wms.DataExchange.WMS.SalePrice; public class SalePriceExchangeDto { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ScrapNote/ScrapNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ScrapNote/ScrapNoteDetailExchangeDto.cs index fa705d4fb..a499d63a4 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ScrapNote/ScrapNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ScrapNote/ScrapNoteDetailExchangeDto.cs @@ -38,9 +38,9 @@ public class ScrapNoteDetailExchangeDto public string ReasonCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/StdCostPrice/StdCostPriceExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/StdCostPrice/StdCostPriceExchangeDto.cs index 72024e249..9523c764f 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/StdCostPrice/StdCostPriceExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/StdCostPrice/StdCostPriceExchangeDto.cs @@ -12,10 +12,10 @@ namespace Win_in.Sfs.Wms.DataExchange.WMS.StdCostPrice; public class StdCostPriceExchangeDto { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierAsn/SupplierAsnDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierAsn/SupplierAsnDetailExchangeDto.cs index e35d1d7b6..935954422 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierAsn/SupplierAsnDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierAsn/SupplierAsnDetailExchangeDto.cs @@ -128,9 +128,9 @@ public class SupplierAsnDetailExchangeDto // [Display(Name = "过期时间")] // public DateTime ExpireDate { get; set; } = DateTime.MaxValue; /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// @@ -140,14 +140,14 @@ public class SupplierAsnDetailExchangeDto public string Remark { get; set; } /// - /// 供应商零件号 + /// 供应商ERP料号 /// - [Display(Name = "供应商零件号")] + [Display(Name = "供应商ERP料号")] public string SupplierItemCode { get; set; } /// - /// 供应商零件名 + /// 供应商物品名 /// - [Display(Name = "供应商零件名")] + [Display(Name = "供应商物品名")] public string SupplierItemName { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierItem/SupplierItemExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierItem/SupplierItemExchangeDto.cs index 90e7536af..45183971b 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierItem/SupplierItemExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierItem/SupplierItemExchangeDto.cs @@ -11,21 +11,21 @@ public class SupplierItemExchangeDto public string SupplierCode { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// - /// 物料号名称 + /// ERP料号名称 /// - [Display(Name = "物料号名称")] + [Display(Name = "ERP料号名称")] public string ItemName { get; set; } /// - /// 供应商物料号 + /// 供应商ERP料号 /// - [Display(Name = "供应商物料号")] + [Display(Name = "供应商ERP料号")] public string SupplierItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/TransferNote/TransferNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/TransferNote/TransferNoteDetailExchangeDto.cs index b50be31b2..e0bf6a44e 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/TransferNote/TransferNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/TransferNote/TransferNoteDetailExchangeDto.cs @@ -10,9 +10,9 @@ public class TransferNoteDetailExchangeDto [Display(Name = "移库单号")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs index f3c73ada1..d3ef03a66 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs @@ -12,9 +12,9 @@ public class UnplannedIssueNoteDetailExchangeDto [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// 来源ERP库位 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs index d8567f572..6360a970d 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs @@ -13,9 +13,9 @@ public class UnplannedReceiptNoteDetailExchangeDto [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Number { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// 来源ERP库位 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml index c1943c344..0799d6c0e 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml @@ -328,7 +328,7 @@ - 物品代码 + ERP料号 @@ -353,7 +353,7 @@ - 物品代码 + ERP料号 @@ -373,12 +373,12 @@ - 父物料号 + 父ERP料号 - 子物料号 + 子ERP料号 @@ -398,7 +398,7 @@ - 物品代码 + ERP料号 @@ -473,7 +473,7 @@ - 物品代码 + ERP料号 @@ -518,7 +518,7 @@ - 物品代码 + ERP料号 @@ -573,7 +573,7 @@ - 物品代码 + ERP料号 @@ -688,7 +688,7 @@ - 物品代码 + ERP料号 @@ -733,7 +733,7 @@ - 物品代码 + ERP料号 @@ -788,7 +788,7 @@ - 物品代码 + ERP料号 @@ -843,7 +843,7 @@ - 物品代码 + ERP料号 @@ -858,7 +858,7 @@ - 零件规格/颜色 + 物品规格/颜色 @@ -888,7 +888,7 @@ - 物品代码 + ERP料号 @@ -908,7 +908,7 @@ - 物品代码 + ERP料号 @@ -978,7 +978,7 @@ - 物品代码 + ERP料号 @@ -1048,7 +1048,7 @@ - 物品代码 + ERP料号 @@ -1088,7 +1088,7 @@ - 零件编号 + 物品编号 @@ -1123,7 +1123,7 @@ - 产成品物料号 + 产成品ERP料号 @@ -1138,7 +1138,7 @@ - 物品代码 + ERP料号 @@ -1153,7 +1153,7 @@ - 物品代码 + ERP料号 @@ -1178,7 +1178,7 @@ - 物品代码 + ERP料号 @@ -1203,7 +1203,7 @@ - 物品代码 + ERP料号 @@ -1273,7 +1273,7 @@ - 物品代码 + ERP料号 @@ -1323,7 +1323,7 @@ - 物品代码 + ERP料号 @@ -1398,7 +1398,7 @@ - 物品代码 + ERP料号 @@ -1443,7 +1443,7 @@ - 物品代码 + ERP料号 @@ -1528,7 +1528,7 @@ - 物品代码 + ERP料号 @@ -1558,7 +1558,7 @@ - 物品代码 + ERP料号 @@ -1603,7 +1603,7 @@ - 物品代码 + ERP料号 @@ -1678,7 +1678,7 @@ - 物品代码 + ERP料号 @@ -1758,7 +1758,7 @@ - 物品代码 + ERP料号 @@ -1768,12 +1768,12 @@ - 供应商零件号 + 供应商ERP料号 - 供应商零件名 + 供应商物品名 @@ -1833,17 +1833,17 @@ - 物料号 + ERP料号 - 物料号名称 + ERP料号名称 - 供应商物料号 + 供应商ERP料号 @@ -1913,7 +1913,7 @@ - 物品代码 + ERP料号 @@ -1978,7 +1978,7 @@ - 物品代码 + ERP料号 @@ -2043,7 +2043,7 @@ - 物品代码 + ERP料号 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Enums/EnumIncomingDataType.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Enums/EnumIncomingDataType.cs index 824808a90..dfce502f1 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Enums/EnumIncomingDataType.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Enums/EnumIncomingDataType.cs @@ -23,7 +23,7 @@ public enum EnumIncomingDataType /// Supplier = 4, /// - /// 供应商零件 + /// 供应商物品 /// SupplierItem = 5, /// @@ -31,7 +31,7 @@ public enum EnumIncomingDataType /// Customer = 6, /// - /// 客户零件 + /// 客户物品 /// CustomerItem = 7, /// @@ -111,7 +111,7 @@ public enum EnumIncomingDataType /// StdCostPrice=26, /// - /// Erp库位零件（开账） + /// Erp库位物品（开账） /// ErpLocationItem = 27, /// diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Localization/DataExchange/zh-Hans.json b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Localization/DataExchange/zh-Hans.json index 409af242b..49d0b6dd4 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Localization/DataExchange/zh-Hans.json +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Localization/DataExchange/zh-Hans.json @@ -12,7 +12,7 @@ "AbpIdentity": "权限控制", "Warehouse": "仓库", "Area": "区域", - "AreaItem": "区域零件", + "AreaItem": "区域物品", "InterfaceCalendar": "日历接口", "Calendar": "日历", "Company": "公司", @@ -37,7 +37,7 @@ "LocationGroup": "库位组", "UserWorkGroup": "工作组", "Location": "库位", - "ItemStoreRelation": "库位零件关系维护", + "ItemStoreRelation": "库位物品关系维护", "InventoryLocationCapacity": "库位可用容量", "Workshop": "车间", "ProductionLine": "生产线", diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/Bases/SfsDataExchangeDetailEntityBase.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/Bases/SfsDataExchangeDetailEntityBase.cs index 01175c3be..2fa5df422 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/Bases/SfsDataExchangeDetailEntityBase.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/Bases/SfsDataExchangeDetailEntityBase.cs @@ -10,7 +10,7 @@ public abstract class SfsDataExchangeDetailEntityBase : SfsDetailEntityBase //public Item Item { get; set; } = new Item(); ///// - ///// 物品代码 + ///// ERP料号 ///// //public string ItemCode { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.MesAgent/JisInfoIncomingDataWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.MesAgent/JisInfoIncomingDataWorker.cs index 3f35a7e4f..dfadf930e 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.MesAgent/JisInfoIncomingDataWorker.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.MesAgent/JisInfoIncomingDataWorker.cs @@ -19,7 +19,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.DataExchange.MesAgent; /// -/// 传输相关的L7零件信息 +/// 传输相关的L7物品信息 /// public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase { @@ -214,7 +214,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase Logger.LogInformation($"{SendLogTitieString}Start adding exist file data in DataExchange Database.File name is {fileName}"); - //开始添加在DataExchange数据库中的L7零件信息 + //开始添加在DataExchange数据库中的L7物品信息 Logger.LogInformation($"{SendLogTitieString}Changing file data to MesProductL7PartsNoteCreateInput."); @@ -224,20 +224,20 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase #region 开始保存Store DataBase - #region 添加没有的配置码零件信息 + #region 添加没有的配置码物品信息 Logger.LogInformation($"{SendLogTitieString}Start adding exist file data in 开始保存Store Database.File name is {fileName}"); var L7PartCodes = deInputs.Select(p => p.L7Part).Distinct().ToList(); - //需要查询的零件列表 + //需要查询的物品列表 var partCodeList = deInputs.Select(p => p.Configuration).Distinct().ToList(); partCodeList.AddRange(L7PartCodes); - //按照零件进行归总 + //按照物品进行归总 var sumEntityList = deInputs.GroupBy(p => new { p.Year, p.ProductNo, p.Program, p.FATA, p.Configuration, p.Position }).ToList(); - //获取所有的L7零件信息，并获取零件是不是采购件、制造件 + //获取所有的L7物品信息，并获取物品是不是采购件、制造件 SfsBaseDataRequestInputBase requestInput = new SfsBaseDataRequestInputBase() { MaxResultCount = 999 }; if (L7PartCodes.Count > 0) { @@ -250,13 +250,13 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase var itemDtoListResult = await itemBasicAppService.GetPagedListByFilterAsync(requestInput, false).ConfigureAwait(false); - //返回的所有需要的零件信息表 + //返回的所有需要的物品信息表 var itemBaseList = itemDtoListResult.Items; Logger.LogInformation($"{SendLogTitieString}Finished geting item basic infos.Info count is{itemDtoListResult.Items.Count}."); #endregion - #region 开始构建Store的L7零件结构表 + #region 开始构建Store的L7物品结构表 List noteList = new List(); foreach (var sumEntity in sumEntityList) @@ -325,7 +325,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase var itemBase = itemBaseList.FirstOrDefault(p => p.Code == detail.L7Part); if (itemBase == null) { - //throw new Exception($"未找到零件{detail.L7PartCode}的零件基础信息，请确认基础信息是否齐全！"); + //throw new Exception($"未找到物品{detail.L7PartCode}的物品基础信息，请确认基础信息是否齐全！"); } else @@ -340,10 +340,10 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase noteList.Add(note); } - #endregion 开始构建Store的L7零件结构表 + #endregion 开始构建Store的L7物品结构表 Logger.LogInformation($"{SendLogTitieString}Starting productL7PartsNoteAppService.CreateAsync."); - //开始添加在Store数据库中的L7零件信息 + //开始添加在Store数据库中的L7物品信息 await productL7PartsNoteAppService.CreateAsync(noteList).ConfigureAwait(false); Logger.LogInformation($"{SendLogTitieString}Finished productL7PartsNoteAppService.CreateAsync."); @@ -361,7 +361,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase } /// - /// 插入对应的零件基础信息 + /// 插入对应的物品基础信息 /// private static async Task InsertItemBasic(string program, string productNo, string configuration, string fata, string position, IItemBasicAppService itemBasicAppService) { @@ -465,7 +465,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase string position = strs[0]; //位置 string FATA = strs[1]; //Fata string configuration = strs[2]; //配置码 - string l7Part = strs[3]; //L7零件号 + string l7Part = strs[3]; //L7ERP料号 string qty = strs[4]; //数量 MesProductL7PartsNoteCreateInput createInput = new MesProductL7PartsNoteCreateInput() @@ -517,11 +517,11 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase #region Delete Store Database Data Logger.LogInformation($"{SendLogTitieString}Start deleteing exist file data in Store Database.File name is {fileName}"); - //开始删除在Store数据库中的L7零件信息 + //开始删除在Store数据库中的L7物品信息 Logger.LogInformation($"{SendLogTitieString}Starting productL7PartsNoteAppService.DeleteByBaseInfoAsync."); - //保存相关L7零件信息 + //保存相关L7物品信息 await productL7PartsNoteAppService.DeleteByBaseInfoAsync(year, program, productNo).ConfigureAwait(false); Logger.LogInformation($"{SendLogTitieString}Finished productL7PartsNoteAppService.DeleteByBaseInfoAsync."); @@ -533,7 +533,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase Logger.LogInformation($"{SendLogTitieString}Start deleteing exist file data in DataExchange Database.File name is {fileName}"); - //开始删除在DataExchange数据库中的L7零件信息 + //开始删除在DataExchange数据库中的L7物品信息 await mesProductL7PartsNoteAppService.DeleteByBaseInfoAsync(year, program, productNo).ConfigureAwait(false); @@ -601,8 +601,8 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase // mesNotes.AddRange(inputList); // } - // #region 添加所有的L7零件信息 - // //获取所有的L7零件信息，并获取零件是不是采购件、制造件 + // #region 添加所有的L7物品信息 + // //获取所有的L7物品信息，并获取物品是不是采购件、制造件 // var L7PartCodes = mesNotes.Select(p => p.L7Part).Distinct().ToList(); // Logger.LogInformation("{SendLogTitieString}Initial mesProductL7PartsNoteAppService..."); @@ -647,7 +647,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase // #endregion - // //按照零件进行归总 + // //按照物品进行归总 // var sumEntityList = mesNotes.GroupBy(p => new { p.ProductNo, p.Program, p.FATA, p.Configuration, p.Position }).ToList(); // List noteList = new List(); @@ -715,7 +715,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase // var itemBase = itemBaseList.FirstOrDefault(p => p.Code == detail.L7Part); // if (itemBase == null) // { - // //throw new Exception($"未找到零件{detail.L7PartCode}的零件基础信息，请确认基础信息是否齐全！"); + // //throw new Exception($"未找到物品{detail.L7PartCode}的物品基础信息，请确认基础信息是否齐全！"); // } // else @@ -741,7 +741,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase // Logger.LogInformation($"{SendLogTitieString}productL7PartsNoteAppService.CreateAsync，" + productL7PartsNoteAppService.ToString()); - // //保存相关L7零件信息 + // //保存相关L7物品信息 // await productL7PartsNoteAppService.CreateAsync(noteList); // Logger.LogInformation($"{SendLogTitieString}productL7PartsNoteAppService.CreateAsync 结束"); diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Domain.Shared/Localization/Auth/zh-Hans.json b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Domain.Shared/Localization/Auth/zh-Hans.json index 48d267701..dd0a3a938 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Domain.Shared/Localization/Auth/zh-Hans.json +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Domain.Shared/Localization/Auth/zh-Hans.json @@ -12,7 +12,7 @@ "AbpIdentity": "权限控制", "Warehouse": "仓库", "Area": "区域", - "AreaItem": "区域零件", + "AreaItem": "区域物品", "InterfaceCalendar": "日历接口", "Calendar": "日历", "Company": "公司", @@ -37,7 +37,7 @@ "LocationGroup": "库位组", "UserWorkGroup": "工作组", "Location": "库位", - "ItemStoreRelation": "库位零件关系维护", + "ItemStoreRelation": "库位物品关系维护", "InventoryLocationCapacity": "库位可用容量", "Workshop": "车间", "ProductionLine": "生产线", diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/MenuAdd.json b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/MenuAdd.json index 9390dea86..2736f93a0 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/MenuAdd.json +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/MenuAdd.json @@ -7,7 +7,7 @@ "company": "IACHZ", "description": "库存查询", "status": 1, - "name": "按零件查询库存", + "name": "按物品查询库存", "icon": "/static/menus/parts.svg", "route": "/pages/inventory/item" } diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/MaterialRequestDashboardDto.cs b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/MaterialRequestDashboardDto.cs index 8d37e6218..39aeb2b84 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/MaterialRequestDashboardDto.cs +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/MaterialRequestDashboardDto.cs @@ -17,7 +17,7 @@ public class MaterialRequestUnIssuedItemQtySumDto public class MaterialRequestUnReceivedItemQtyByItemDto { - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } [Display(Name = "总数")] @@ -38,7 +38,7 @@ public class MaterialRequestUnReceivedItemDto [Display(Name = "单据号")] public string Number { get; set; } - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } [Display(Name = "物料描述")] diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PlanAndActualDashboardDto.cs b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PlanAndActualDashboardDto.cs index 26fba190d..11f0ab0b9 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PlanAndActualDashboardDto.cs +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PlanAndActualDashboardDto.cs @@ -17,9 +17,9 @@ public class PlanAndActualDashboardDto public string SupplierShortName { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PurchaseReceiptDashboardDto.cs b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PurchaseReceiptDashboardDto.cs index 6e3dc57ce..fdf0bfad1 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PurchaseReceiptDashboardDto.cs +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PurchaseReceiptDashboardDto.cs @@ -35,9 +35,9 @@ public class PurchaseReceiptItemDashboardDto public string SupplierShortName { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs index 52c3ba58b..1cdaea686 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs @@ -57,7 +57,7 @@ public class BalanceController : AbpController } /// - /// 根据库位获取零件信息 + /// 根据库位获取物品信息 /// /// /// @@ -303,7 +303,7 @@ public class BalanceController : AbpController } /// - /// 根据零件获取库位信息 + /// 根据物品获取库位信息 /// /// /// @@ -536,7 +536,7 @@ public class BalanceController : AbpController } else { - throw new UserFriendlyException($"未找到生产线【{productLine}】零件【{itemCode}】关系"); + throw new UserFriendlyException($"未找到生产线【{productLine}】物品【{itemCode}】关系"); } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/DTOs/AQLDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/DTOs/AQLDTO.cs index f36ed6c2d..32c926bf6 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/DTOs/AQLDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/DTOs/AQLDTO.cs @@ -7,9 +7,9 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class AQLDTO : SfsBaseDataDTOBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLEditInput.cs index be8f75f94..34869b8a4 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLEditInput.cs @@ -7,9 +7,9 @@ public class AQLEditInput : SfsBaseDataCreateOrUpdateInputBase { #region Base /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLImportInput.cs index 28fcd5459..528a61b3f 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLImportInput.cs @@ -7,10 +7,10 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class AQLImportInput : SfsBaseDataImportInputBase { /// - /// 物品代码 + /// ERP料号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/DTOs/BomComponentDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/DTOs/BomComponentDTO.cs index 85b037804..40e499198 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/DTOs/BomComponentDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/DTOs/BomComponentDTO.cs @@ -12,16 +12,16 @@ public class BomComponentDTO - [Display(Name = "根物料号")] + [Display(Name = "根ERP料号")] public string Root { get; set; } - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string Component { get; set; } [Display(Name = "单位")] public string ComponentUom { get; set; } [Display(Name = "用量")] public decimal ComponentQty { get; set; } - [Display(Name = "父物料号")] + [Display(Name = "父ERP料号")] public string ParentComponent { get; set; } [Display(Name = "合计数量")] public decimal SumQty { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/DTOs/BomDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/DTOs/BomDTO.cs index 706be8ba0..ae9c2127d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/DTOs/BomDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/DTOs/BomDTO.cs @@ -13,16 +13,16 @@ public class BomDTO : SfsBaseDataDTOBase { /// - /// 父物料号 + /// 父ERP料号 /// - [Display(Name = "父物料号")] + [Display(Name = "父ERP料号")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Product { get; set; } /// - /// 子物料号 + /// 子ERP料号 /// - [Display(Name = "子物料号")] + [Display(Name = "子ERP料号")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Component { get; set; } @@ -89,9 +89,9 @@ public class BomDTO : SfsBaseDataDTOBase public EnumPlannedSplitRule PlannedSplitRule { get; set; } /// - /// 子物品号 + /// 子ERP料号 /// - [Display(Name = "子物品号")] + [Display(Name = "子ERP料号")] public List ComponentDTOs { get; set; } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/IBomAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/IBomAppService.cs index 76815f40e..2cccf3669 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/IBomAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/IBomAppService.cs @@ -22,14 +22,14 @@ public interface IBomAppService Task> GetBomStepByStepAsync(string productItemCode, DateTime validTime, bool isStepByStep = true); /// - /// 所有子物料号 + /// 所有子ERP料号 /// /// /// Task> GetListOfProductAsync(string product); /// - /// 所有父物料号 + /// 所有父ERP料号 /// /// /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/Inputs/BomEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/Inputs/BomEditInput.cs index c86af5f9f..aa7a3c69b 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/Inputs/BomEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/Inputs/BomEditInput.cs @@ -75,17 +75,17 @@ public class BomEditInput : SfsBaseDataCreateOrUpdateInputBase #region create only /// - /// 父物料号 + /// 父ERP料号 /// - [Display(Name = "父物料号")] + [Display(Name = "父ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Product { get; set; } /// - /// 子物料号 + /// 子ERP料号 /// - [Display(Name = "子物料号")] + [Display(Name = "子ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Component { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/Inputs/BomImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/Inputs/BomImportInput.cs index a0344db70..6efa09f17 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/Inputs/BomImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Boms/Inputs/BomImportInput.cs @@ -10,19 +10,19 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class BomImportInput : SfsBaseDataImportInputBase { /// - /// 父物料号 + /// 父ERP料号 /// [Key] - [Display(Name = "父物料号")] - [Required(ErrorMessage = "父物料号是必填项")] + [Display(Name = "父ERP料号")] + [Required(ErrorMessage = "父ERP料号是必填项")] public string Product { get; set; } /// - /// 子物料号 + /// 子ERP料号 /// [Key] - [Display(Name = "子物料号")] - [Required(ErrorMessage = "子物料号是必填项")] + [Display(Name = "子ERP料号")] + [Required(ErrorMessage = "子ERP料号是必填项")] public string Component { get; set; } [ImporterHeader(Name = "子物料用量", Format = "#,##0")] diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/DTOs/CustomerItemDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/DTOs/CustomerItemDTO.cs index a9b783f32..c6c67e173 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/DTOs/CustomerItemDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/DTOs/CustomerItemDTO.cs @@ -17,16 +17,16 @@ public class CustomerItemDTO : SfsBaseDataDTOBase public string CustomerCode { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } /// - /// 客户物料号 + /// 客户ERP料号 /// - [Display(Name = "客户物料号")] + [Display(Name = "客户ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string CustomerItemCode { get; set; } @@ -62,9 +62,9 @@ public class CustomerItemDTO : SfsBaseDataDTOBase public DateTime? EndTime { get; set; } /// - /// 客户零件库位 + /// 客户物品库位 /// - [Display(Name = "客户零件库位")] + [Display(Name = "客户物品库位")] public string LocationCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemEditInput.cs index f6719dd70..8567aa5ab 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemEditInput.cs @@ -8,9 +8,9 @@ public class CustomerItemEditInput : SfsBaseDataCreateOrUpdateInputBase { #region Base /// - /// 客户物料号 + /// 客户ERP料号 /// - [Display(Name = "客户物料号")] + [Display(Name = "客户ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string CustomerItemCode { get; set; } @@ -47,9 +47,9 @@ public class CustomerItemEditInput : SfsBaseDataCreateOrUpdateInputBase public DateTime? EndTime { get; set; } /// - /// 客户零件库位 + /// 客户物品库位 /// - [Display(Name = "客户零件库位")] + [Display(Name = "客户物品库位")] public string LocationCode { get; set; } #endregion @@ -64,9 +64,9 @@ public class CustomerItemEditInput : SfsBaseDataCreateOrUpdateInputBase public string CustomerCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs index bb1f2b228..b306fa646 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs @@ -9,10 +9,10 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class CustomerItemImportInput : SfsBaseDataImportInputBase { /// - /// 物品代码 + /// ERP料号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } @@ -27,9 +27,9 @@ public class CustomerItemImportInput : SfsBaseDataImportInputBase public string CustomerCode { get; set; } /// - /// 客户物品代码 + /// 客户ERP料号 /// - [Display(Name = "客户物品代码")] + [Display(Name = "客户ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string CustomerItemCode { get; set; } @@ -57,9 +57,9 @@ public class CustomerItemImportInput : SfsBaseDataImportInputBase public string Version { get; set; } /// - /// 客户零件库位 + /// 客户物品库位 /// - [Display(Name = "客户零件库位")] + [Display(Name = "客户物品库位")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string LocationCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentLocCapDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentLocCapDTO.cs index 96125bfe8..4dae27092 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentLocCapDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentLocCapDTO.cs @@ -17,7 +17,7 @@ public class EquipmentLocCapDTO : SfsBaseDataDTOBase, IHasCode [Display(Name = "占用百分比")] public decimal Percent { get; set; } /// - /// 零件号 + /// ERP料号 /// public string PartCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentPartCodeDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentPartCodeDTO.cs index 2a6510242..0804ae330 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentPartCodeDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentPartCodeDTO.cs @@ -7,7 +7,7 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; using System; using System.Collections.Generic; -[Display(Name = "器具零件关系信息")] +[Display(Name = "器具物品关系信息")] public class EquipmentPartCodeDTO : SfsBaseDataDTOBase, IHasCode { @@ -28,7 +28,7 @@ public class EquipmentPartCodeDTO : SfsBaseDataDTOBase, IHasCode /// /// 库位编号 /// - [Display(Name = "零件代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string PartCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentRecordErrorDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentRecordErrorDTO.cs index dc82187c1..1d5e84438 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentRecordErrorDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentRecordErrorDTO.cs @@ -11,7 +11,7 @@ public class EquipmentRecordErrorDTO { [Display(Name = "器具代码")] public string EqptCode { set; get; } - [Display(Name = "零件代码")] + [Display(Name = "ERP料号")] public string PartCode { set; get; } [Display(Name = "错误信息")] public string Error { set; get; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentAreaEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentAreaEditInput.cs index be0f614ca..89903b291 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentAreaEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentAreaEditInput.cs @@ -139,9 +139,9 @@ public class EquipmentAreaEditInput : SfsBaseDataCreateOrUpdateInputBase //public string Configuration { get; set; } ///// - ///// 虚零件 + ///// 虚物品 ///// - //[Display(Name = "虚零件(Is phantom)")] + //[Display(Name = "虚物品(Is phantom)")] //public virtual bool IsPhantom { get; set; } ///// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentEditInput.cs index 03b54c027..acfbdf6b8 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentEditInput.cs @@ -150,9 +150,9 @@ public class EquipmentEditInput : SfsBaseDataCreateOrUpdateInputBase //public string Configuration { get; set; } ///// - ///// 虚零件 + ///// 虚物品 ///// - //[Display(Name = "虚零件(Is phantom)")] + //[Display(Name = "虚物品(Is phantom)")] //public virtual bool IsPhantom { get; set; } ///// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentLocCapImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentLocCapImportInput.cs index 796c95708..8f3bb7c53 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentLocCapImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentLocCapImportInput.cs @@ -17,7 +17,7 @@ public class EquipmentLocCapImportInput : SfsBaseDataImportInputBase /// [Display(Name = "占用百分比")] public decimal Percent { get; set; } - //[Display(Name = "零件代码")] + //[Display(Name = "ERP料号")] //public string PartCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeCheckInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeCheckInput.cs index 2e8051cb1..e664036c9 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeCheckInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeCheckInput.cs @@ -26,7 +26,7 @@ public class EquipmentPartCodeCheckInput /// /// 库位编号 /// - [Display(Name = "零件代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string PartCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeEditInput.cs index aa5b93511..e9f30364a 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeEditInput.cs @@ -25,7 +25,7 @@ public class EquipmentPartCodeEditInput : SfsBaseDataCreateOrUpdateInputBase /// /// 库位编号 /// - [Display(Name = "零件代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string PartCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeImportInput.cs index 77e58034e..0ede2926d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentPartCodeImportInput.cs @@ -27,7 +27,7 @@ public class EquipmentPartCodeImportInput : SfsBaseDataImportInputBase /// /// 库位编号 /// - [Display(Name = "零件代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string PartCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/DTOs/ErpLocationItemDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/DTOs/ErpLocationItemDTO.cs index 2876b32c7..e762cc0bd 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/DTOs/ErpLocationItemDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/DTOs/ErpLocationItemDTO.cs @@ -8,9 +8,9 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ErpLocationItemDTO : SfsBaseDataDTOBase { /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/Inputs/ErpLocationItemEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/Inputs/ErpLocationItemEditInput.cs index b1146b608..0e9684a6c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/Inputs/ErpLocationItemEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/Inputs/ErpLocationItemEditInput.cs @@ -6,9 +6,9 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ErpLocationItemEditInput : SfsBaseDataCreateOrUpdateInputBase { /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/Inputs/ErpLocationItemImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/Inputs/ErpLocationItemImportInput.cs index 90c39292e..0abd1ccb6 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/Inputs/ErpLocationItemImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ErpLocationItems/Inputs/ErpLocationItemImportInput.cs @@ -8,10 +8,10 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ErpLocationItemImportInput : SfsBaseDataImportInputBase { /// - /// 物料代码 + /// ERP料号 /// [Key] - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}不能为空")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/DTOs/ItemBasicDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/DTOs/ItemBasicDTO.cs index 82c033140..9f77fc1cd 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/DTOs/ItemBasicDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/DTOs/ItemBasicDTO.cs @@ -154,9 +154,9 @@ public class ItemBasicDTO : SfsBaseDataDTOBase, IHasCode, IHasName public string Elevel { get; set; } /// - /// 虚零件 + /// 虚物品 /// - [Display(Name = "虚零件(Is phantom)")] + [Display(Name = "虚物品(Is phantom)")] public virtual bool IsPhantom { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/DTOs/ItemBasicForDongyangExportDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/DTOs/ItemBasicForDongyangExportDTO.cs index f2d879124..e6e633cc4 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/DTOs/ItemBasicForDongyangExportDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/DTOs/ItemBasicForDongyangExportDTO.cs @@ -88,9 +88,9 @@ public class ItemBasicForDongyangExportDTO public string Elevel { get; set; } /// - /// 虚零件 + /// 虚物品 /// - [Display(Name = "虚零件(Is phantom)")] + [Display(Name = "虚物品(Is phantom)")] public virtual bool IsPhantom { get; set; } /// /// 物料分类 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicEditInput.cs index b142cc8ff..0405ee313 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicEditInput.cs @@ -96,9 +96,9 @@ public class ItemBasicEditInput : SfsBaseDataCreateOrUpdateInputBase public string Configuration { get; set; } /// - /// 虚零件 + /// 虚物品 /// - [Display(Name = "虚零件(Is phantom)")] + [Display(Name = "虚物品(Is phantom)")] public virtual bool IsPhantom { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs index 3a847cf3d..dedb70ecc 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs @@ -10,10 +10,10 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ItemBasicImportInput : SfsBaseDataImportInputBase { /// - /// 物品代码 + /// ERP料号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Code { get; set; } @@ -181,9 +181,9 @@ public class ItemBasicImportInput : SfsBaseDataImportInputBase public string Elevel { get; set; } /// - /// 虚零件 + /// 虚物品 /// - [Display(Name = "虚零件(Is phantom)")] + [Display(Name = "虚物品(Is phantom)")] [Required(ErrorMessage = "{0}是必填项")] public virtual bool IsPhantom { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/DTOs/ItemCategoryDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/DTOs/ItemCategoryDTO.cs index 73f3520fa..e6e585506 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/DTOs/ItemCategoryDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/DTOs/ItemCategoryDTO.cs @@ -8,9 +8,9 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ItemCategoryDTO : SfsBaseDataDTOBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "物品编号是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryEditInput.cs index 7ace66ac9..a1eeca8d8 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryEditInput.cs @@ -25,9 +25,9 @@ public class ItemCategoryEditInput : SfsBaseDataCreateOrUpdateInputBase public string CategoryCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryImportInput.cs index f66abd2fc..0f3ac8827 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryImportInput.cs @@ -7,10 +7,10 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ItemCategoryImportInput : SfsBaseDataImportInputBase { /// - /// 物品代码 + /// ERP料号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/DTOs/ItemContainerDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/DTOs/ItemContainerDTO.cs index 55ee91a40..d8bcad020 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/DTOs/ItemContainerDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/DTOs/ItemContainerDTO.cs @@ -22,9 +22,9 @@ public class ItemContainerDTO : SfsBaseDataDTOBase public string ContainerName { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerEditInput.cs index fe6a1034a..9cb10483b 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerEditInput.cs @@ -37,9 +37,9 @@ public class ItemContainerEditInput : SfsBaseDataCreateOrUpdateInputBase public string ContainerCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs index 32f1f6a90..d77f6c514 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs @@ -7,7 +7,7 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ItemGuideBookDTO : SfsBaseDataDTOBase { /// - /// 物品代码 + /// ERP料号 /// [Display(Name = "物品编码")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/Inputs/ItemGuideBookEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/Inputs/ItemGuideBookEditInput.cs index 226e83d44..dce707724 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/Inputs/ItemGuideBookEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/Inputs/ItemGuideBookEditInput.cs @@ -20,9 +20,9 @@ public class ItemGuideBookEditInput : SfsBaseDataCreateOrUpdateInputBase #region Create /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } #endregion } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/Inputs/ItemGuideBookImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/Inputs/ItemGuideBookImportInput.cs index 0ed12f76f..3456d11c5 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/Inputs/ItemGuideBookImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/Inputs/ItemGuideBookImportInput.cs @@ -12,7 +12,7 @@ public class ItemGuideBookImportInput : SfsBaseDataImportInputBase /// 物品编号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "物品编号是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/DTOs/ItemPackDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/DTOs/ItemPackDTO.cs index 4866786de..3138e60a1 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/DTOs/ItemPackDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/DTOs/ItemPackDTO.cs @@ -27,9 +27,9 @@ public class ItemPackDTO : SfsBaseDataDTOBase [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] public string PackType { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/Inputs/ItemPackEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/Inputs/ItemPackEditInput.cs index 22ebdaa7f..c3b93f392 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/Inputs/ItemPackEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/Inputs/ItemPackEditInput.cs @@ -43,9 +43,9 @@ public class ItemPackEditInput : SfsBaseDataCreateOrUpdateInputBase public string PackCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/DTOs/ItemQualityDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/DTOs/ItemQualityDTO.cs index db643dd23..e5cf54f67 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/DTOs/ItemQualityDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/DTOs/ItemQualityDTO.cs @@ -10,9 +10,9 @@ public class ItemQualityDTO : SfsBaseDataDTOBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityEditInput.cs index 0d910d67c..0735e7a9e 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityEditInput.cs @@ -31,9 +31,9 @@ public class ItemQualityEditInput : SfsBaseDataCreateOrUpdateInputBase #region Create /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityImportInput.cs index fdcb12022..f1391de3a 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityImportInput.cs @@ -13,7 +13,7 @@ public class ItemQualityImportInput : SfsBaseDataImportInputBase /// 物品编号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "物品编号是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/DTOs/ItemSafetyStockDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/DTOs/ItemSafetyStockDTO.cs index e9d29af4f..e0cef490d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/DTOs/ItemSafetyStockDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/DTOs/ItemSafetyStockDTO.cs @@ -8,9 +8,9 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ItemSafetyStockDTO : SfsBaseDataDTOBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockEditInput.cs index 0d44ff3f8..3a8992060 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockEditInput.cs @@ -58,9 +58,9 @@ public class ItemSafetyStockEditInput : SfsBaseDataWithWarehouseCreateOrUpdateIn #region Create /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockImportInput.cs index 6ce177f58..5cbfe34b9 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockImportInput.cs @@ -5,15 +5,15 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Basedata.Application.Contracts; -[Display(Name = "库位零件关系")] +[Display(Name = "库位物品关系")] public class ItemSafetyStockImportInput : SfsBaseDataImportInputBase { /// - /// 物品代码 + /// ERP料号 /// [Key] - [Display(Name = "物品代码")] - [Required(ErrorMessage = "物品代码是必填项")] + [Display(Name = "ERP料号")] + [Required(ErrorMessage = "ERP料号是必填项")] public string ItemCode { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/DTOs/ItemStoreRelationDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/DTOs/ItemStoreRelationDTO.cs index 1b813cb7c..62753b6ec 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/DTOs/ItemStoreRelationDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/DTOs/ItemStoreRelationDTO.cs @@ -9,9 +9,9 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class ItemStoreRelationDTO : SfsBaseDataDTOBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationEditInput.cs index 347d23219..8f37e18c1 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationEditInput.cs @@ -72,9 +72,9 @@ public class ItemStoreRelationEditInput : SfsBaseDataWithWarehouseCreateOrUpdate #region Create /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs index e1e10c1b3..be5deaec9 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs @@ -5,14 +5,14 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Basedata.Application.Contracts; -[Display(Name = "库位零件关系")] +[Display(Name = "库位物品关系")] public class ItemStoreRelationImportInput : SfsBaseDataImportInputBase { /// - /// 物品代码 + /// ERP料号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs index 026fe3b54..ccdbdcaf8 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs @@ -33,7 +33,7 @@ public class KittingErrorDto public string Code { get; set; } - [Display(Name = "零件代码")] + [Display(Name = "ERP料号")] public string PartCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationCheckInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationCheckInput.cs index 01e90b3e4..e277eb23c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationCheckInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationCheckInput.cs @@ -37,9 +37,9 @@ public class LocationCheckInput public List Warehouses { get; set; } = new(); /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs index b6e33ad2d..aaafeb35a 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs @@ -15,9 +15,9 @@ public class PositionCodeDTO : SfsBaseDataDTOBase, IHasCode [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Code { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string PartCode { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs index 9aba2bd2e..34ad3771d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs @@ -10,9 +10,9 @@ public class PositionCodeEditInput : SfsBaseDataCreateOrUpdateInputBase { #region Base /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string PartCode { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs index 121cdb5b7..349d976cb 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs @@ -17,9 +17,9 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase [Required(ErrorMessage = "{0}是必填项")] public string Code { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required(ErrorMessage = "{0}是必填项")] public string PartCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/DTOs/ProductionLineItemDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/DTOs/ProductionLineItemDTO.cs index ba932f2f9..c2c70f1c1 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/DTOs/ProductionLineItemDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/DTOs/ProductionLineItemDTO.cs @@ -22,10 +22,10 @@ public class ProductionLineItemDTO : SfsBaseDataDTOBase public string ProdLineCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/Inputs/ProductionLineItemEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/Inputs/ProductionLineItemEditInput.cs index 64d2f07d2..0bc70dd88 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/Inputs/ProductionLineItemEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/Inputs/ProductionLineItemEditInput.cs @@ -20,9 +20,9 @@ public class ProductionLineItemEditInput : SfsBaseDataCreateOrUpdateInputBase public string ProdLineCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/Inputs/ProductionLineItemImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/Inputs/ProductionLineItemImportInput.cs index 82a581d93..689b0a3fe 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/Inputs/ProductionLineItemImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductLineItems/Inputs/ProductionLineItemImportInput.cs @@ -21,9 +21,9 @@ public class ProductionLineItemImportInput : SfsBaseDataImportInputBase public string ProdLineCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/DTOs/PurchasePriceSheetDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/DTOs/PurchasePriceSheetDTO.cs index 08a19b4a3..0b2a56b67 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/DTOs/PurchasePriceSheetDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/DTOs/PurchasePriceSheetDTO.cs @@ -17,7 +17,7 @@ public class PurchasePriceSheetDTO : SfsBaseDataDTOBase /// /// 价格单编码 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/Inputs/PurchasePriceSheetEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/Inputs/PurchasePriceSheetEditInput.cs index 946fe004f..0a720f9db 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/Inputs/PurchasePriceSheetEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/Inputs/PurchasePriceSheetEditInput.cs @@ -22,7 +22,7 @@ public class PurchasePriceSheetEditInput : SfsBaseDataCreateOrUpdateInputBase /// /// 价格单编码 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/Inputs/PurchasePriceSheetImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/Inputs/PurchasePriceSheetImportInput.cs index 3a4842ef7..3fff0b2b8 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/Inputs/PurchasePriceSheetImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PurchasePrices/Inputs/PurchasePriceSheetImportInput.cs @@ -16,7 +16,7 @@ public class PurchasePriceSheetImportInput : SfsBaseDataImportInputBase /// /// 价格单编码 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/DTOs/SalePriceSheetDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/DTOs/SalePriceSheetDTO.cs index 4df127f85..edf26813c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/DTOs/SalePriceSheetDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/DTOs/SalePriceSheetDTO.cs @@ -14,9 +14,9 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; public class SalePriceSheetDTO : SfsBaseDataDTOBase { /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/Inputs/SalePriceSheetEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/Inputs/SalePriceSheetEditInput.cs index 5bacb202e..cd0d57829 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/Inputs/SalePriceSheetEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/Inputs/SalePriceSheetEditInput.cs @@ -19,9 +19,9 @@ public class SalePriceSheetEditInput : SfsBaseDataCreateOrUpdateInputBase public string Description { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/Inputs/SalePriceSheetImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/Inputs/SalePriceSheetImportInput.cs index 82dcadb6b..5c5628b49 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/Inputs/SalePriceSheetImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SalePrices/Inputs/SalePriceSheetImportInput.cs @@ -20,9 +20,9 @@ public class SalePriceSheetImportInput : SfsBaseDataImportInputBase public string Description { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } 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 c0d83cfb7..7f7c482c6 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 @@ -79,9 +79,9 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase public decimal ToQty { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// 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 595d7a362..1715995bc 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 @@ -83,7 +83,7 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase public decimal ToQty { get; set; } /// - /// 物料号 + /// ERP料号 /// [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/DTOs/StdCostPriceSheetDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/DTOs/StdCostPriceSheetDTO.cs index fa1cafb39..c42d2fd44 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/DTOs/StdCostPriceSheetDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/DTOs/StdCostPriceSheetDTO.cs @@ -13,7 +13,7 @@ public class StdCostPriceSheetDTO : SfsBaseDataDTOBase /// /// 价格单编码 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/Inputs/StdCostPriceSheetEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/Inputs/StdCostPriceSheetEditInput.cs index 8e6ff07ef..a890dd9e2 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/Inputs/StdCostPriceSheetEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/Inputs/StdCostPriceSheetEditInput.cs @@ -27,9 +27,9 @@ public class StdCostPriceSheetEditInput : SfsBaseDataCreateOrUpdateInputBase #region Create /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/Inputs/StdCostPriceSheetImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/Inputs/StdCostPriceSheetImportInput.cs index 8538b47bb..4a4e6d245 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/Inputs/StdCostPriceSheetImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/StdCostPrices/Inputs/StdCostPriceSheetImportInput.cs @@ -23,9 +23,9 @@ public class StdCostPriceSheetImportInput : SfsBaseDataImportInputBase public decimal StdCostPrice { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/DTOs/SupplierItemDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/DTOs/SupplierItemDTO.cs index 0d98103a2..58f7e24b0 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/DTOs/SupplierItemDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/DTOs/SupplierItemDTO.cs @@ -24,9 +24,9 @@ public class SupplierItemDTO : SfsBaseDataDTOBase public string SupplierSimpleName { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } @@ -38,9 +38,9 @@ public class SupplierItemDTO : SfsBaseDataDTOBase public string ItemName { get; set; } /// - /// 供应商物料号 + /// 供应商ERP料号 /// - [Display(Name = "供应商物料号")] + [Display(Name = "供应商ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string SupplierItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemEditInput.cs index d41794bdf..c5686295e 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemEditInput.cs @@ -10,9 +10,9 @@ public class SupplierItemEditInput : SfsBaseDataCreateOrUpdateInputBase { #region Base /// - /// 供应商物料号 + /// 供应商ERP料号 /// - [Display(Name = "供应商物料号")] + [Display(Name = "供应商ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string SupplierItemCode { get; set; } @@ -43,16 +43,16 @@ public class SupplierItemEditInput : SfsBaseDataCreateOrUpdateInputBase public decimal QtyPerPallet { get; set; } /// - /// 物料号名称 + /// ERP料号名称 /// - [Display(Name = "物料号名称")] + [Display(Name = "ERP料号名称")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemName { get; set; } /// /// 供应商简称 /// - /// [Display(Name = "物料号名称")] + /// [Display(Name = "ERP料号名称")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string SupplierSimpleName { get; set; } #endregion @@ -67,9 +67,9 @@ public class SupplierItemEditInput : SfsBaseDataCreateOrUpdateInputBase public string SupplierCode { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemImportInput.cs index 6f1b8dc53..d7eadd242 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemImportInput.cs @@ -26,18 +26,18 @@ public class SupplierItemImportInput : SfsBaseDataImportInputBase public string SupplierSimpleName { get; set; } /// - /// 物品代码 + /// ERP料号 /// [Key] - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } /// - /// 供应商物品代码 + /// 供应商ERP料号 /// - [Display(Name = "供应商物品代码")] + [Display(Name = "供应商ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string SupplierItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Win_in.Sfs.Basedata.Application.Contract.xml b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Win_in.Sfs.Basedata.Application.Contract.xml index 5542756c5..e0557b2e6 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Win_in.Sfs.Basedata.Application.Contract.xml +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Win_in.Sfs.Basedata.Application.Contract.xml @@ -6,7 +6,7 @@ - 物品代码 + ERP料号 @@ -91,7 +91,7 @@ - 物品代码 + ERP料号 @@ -201,7 +201,7 @@ - 物品代码 + ERP料号 @@ -241,7 +241,7 @@ - 物品代码 + ERP料号 @@ -281,7 +281,7 @@ - 物品代码 + ERP料号 @@ -421,12 +421,12 @@ - 父物料号 + 父ERP料号 - 子物料号 + 子ERP料号 @@ -481,17 +481,17 @@ - 子物品号 + 子ERP料号 - 父物料号 + 父ERP料号 - 子物料号 + 子ERP料号 @@ -521,26 +521,26 @@ - 所有子物料号 + 所有子ERP料号 - 所有父物料号 + 所有父ERP料号 - 父物料号 + 父ERP料号 - 子物料号 + 子ERP料号 @@ -605,12 +605,12 @@ - 父物料号 + 父ERP料号 - 子物料号 + 子ERP料号 @@ -1560,12 +1560,12 @@ - 物料号 + ERP料号 - 客户物料号 + 客户ERP料号 @@ -1600,12 +1600,12 @@ - 物料号 + ERP料号 - 客户物料号 + 客户ERP料号 @@ -1620,7 +1620,7 @@ - 物料号 + ERP料号 @@ -1630,7 +1630,7 @@ - 客户物料号 + 客户ERP料号 @@ -2695,7 +2695,7 @@ - 虚零件 + 虚物品 @@ -2710,12 +2710,12 @@ - 虚零件 + 虚物品 - 虚零件 + 虚物品 @@ -2790,7 +2790,7 @@ - 虚零件 + 虚物品 @@ -2800,7 +2800,7 @@ - 物品代码 + ERP料号 @@ -2835,7 +2835,7 @@ - 物品代码 + ERP料号 @@ -2865,7 +2865,7 @@ - 物料代码 + ERP料号 @@ -2895,7 +2895,7 @@ - 物品代码 + ERP料号 @@ -2950,7 +2950,7 @@ - 物品代码 + ERP料号 @@ -3000,7 +3000,7 @@ - 物品代码 + ERP料号 @@ -3060,7 +3060,7 @@ - 物品代码 + ERP料号 @@ -3105,7 +3105,7 @@ - 物品代码 + ERP料号 @@ -3160,7 +3160,7 @@ - 物品代码 + ERP料号 @@ -3225,7 +3225,7 @@ - 物品代码 + ERP料号 @@ -3285,7 +3285,7 @@ - 物品代码 + ERP料号 @@ -3340,7 +3340,7 @@ - 物品代码 + ERP料号 @@ -5055,17 +5055,17 @@ - 物料号 + ERP料号 - 物料号名称 + ERP料号名称 - 供应商物料号 + 供应商ERP料号 @@ -5105,12 +5105,12 @@ - 物料代码 + ERP料号 - 供应商物品代码 + 供应商ERP料号 @@ -5145,7 +5145,7 @@ - 物料号 + ERP料号 @@ -5160,7 +5160,7 @@ - 供应商物料号 + 供应商ERP料号 @@ -5185,14 +5185,14 @@ - 物料号名称 + ERP料号名称 供应商简称 - [Display(Name = "物料号名称")] + [Display(Name = "ERP料号名称")] diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/tests/Class1.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/tests/Class1.cs index e2d9b7254..1401e6a5b 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/tests/Class1.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/tests/Class1.cs @@ -28,8 +28,8 @@ public class ResponCargoItem // 货位号 [Display(Name = "货位号")] public string CargoID { set; get; } = ""; - // 零件号 - [Display(Name = "零件号")] + // ERP料号 + [Display(Name = "ERP料号")] public string PartCode { set; get; } = ""; //货位状态 1 – 货位占用 0 – 货位空闲 [Display(Name = "货位状态")] diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Bases/SfsBaseDataAppServiceBase.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Bases/SfsBaseDataAppServiceBase.cs index 976692314..747db7bbe 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Bases/SfsBaseDataAppServiceBase.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Bases/SfsBaseDataAppServiceBase.cs @@ -50,7 +50,7 @@ public abstract class SfsBaseDataAppServiceBase - /// 所有子物料号 + /// 所有子ERP料号 /// /// /// @@ -90,7 +90,7 @@ public class BomAppService : } /// - /// 所有父物料号 + /// 所有父ERP料号 /// /// /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentPartCodeAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentPartCodeAppService.cs index 5a9bf75b8..05092a95d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentPartCodeAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentPartCodeAppService.cs @@ -83,7 +83,7 @@ public class EquipmentPartCodeAppService } else { - throw new UserFriendlyException($"已存在器具代码{input.Code}和零件代码{input.PartCode}关系!"); + throw new UserFriendlyException($"已存在器具代码{input.Code}和ERP料号{input.PartCode}关系!"); } } [HttpPost] diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ErpLocationItems/ErpLocationItemAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ErpLocationItems/ErpLocationItemAppService.cs index a15dfd319..0f00224b3 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ErpLocationItems/ErpLocationItemAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ErpLocationItems/ErpLocationItemAppService.cs @@ -52,7 +52,7 @@ public class ErpLocationItemAppService public override async Task CreateAsync(ErpLocationItemEditInput input) { var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false); - Check.NotNull(itemBasic, "物品代码", $"物品 {input.ItemCode} 不存在"); + Check.NotNull(itemBasic, "ERP料号", $"物品 {input.ItemCode} 不存在"); var erpLocation = await ErpLocationAppService.GetByCodeAsync(input.ErpLocationCode).ConfigureAwait(false); Check.NotNull(erpLocation, "储位代码", $"储位 {input.ErpLocationCode} 不存在"); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs index ba8e2957d..10ba51340 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs @@ -57,7 +57,7 @@ public class ItemContainerAppService } var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false); - Check.NotNull(itemBasic, "物品代码", $"物品 {input.ItemCode} 不存在"); + Check.NotNull(itemBasic, "ERP料号", $"物品 {input.ItemCode} 不存在"); if(itemBasic != null) { input.BasicUom = itemBasic.BasicUom; diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAppService.cs index 5ed9da8b2..a079b54c6 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAppService.cs @@ -37,7 +37,7 @@ public class ItemGuideBookAppService : SfsBaseDataAppServiceBase CreateAsync(ItemGuideBookEditInput input) { var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false); - Check.NotNull(itemBasic, "物品代码", $"物品 {input.ItemCode} 不存在"); + Check.NotNull(itemBasic, "ERP料号", $"物品 {input.ItemCode} 不存在"); var entity = ObjectMapper.Map(input); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemSafetyStocks/ItemSafetyStockAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemSafetyStocks/ItemSafetyStockAppService.cs index 0d58c3a11..3e346772d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemSafetyStocks/ItemSafetyStockAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemSafetyStocks/ItemSafetyStockAppService.cs @@ -56,7 +56,7 @@ public class ItemSafetyStockAppService : SfsBaseDataAppServiceBase - /// 根据零件号 和 存储关系类型 获取 零件和库位关系 + /// 根据ERP料号 和 存储关系类型 获取 物品和库位关系 /// /// /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemStoreRelations/ItemStoreRelationAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemStoreRelations/ItemStoreRelationAppService.cs index 204a4638e..a29ab4d83 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemStoreRelations/ItemStoreRelationAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemStoreRelations/ItemStoreRelationAppService.cs @@ -71,7 +71,7 @@ public class ItemStoreRelationAppService : SfsBaseDataAppServiceBase - /// 根据零件号 和 存储关系类型 获取 零件和库位关系 + /// 根据ERP料号 和 存储关系类型 获取 物品和库位关系 /// /// /// @@ -114,7 +114,7 @@ public class ItemStoreRelationAppService : SfsBaseDataAppServiceBase - /// 当前库位 允许的 零件关系 + /// 当前库位 允许的 物品关系 /// /// /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemTransformNote/ItemTransformNoteDetailExchangeDto.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemTransformNote/ItemTransformNoteDetailExchangeDto.cs index 211d70c8c..349ce69cc 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemTransformNote/ItemTransformNoteDetailExchangeDto.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemTransformNote/ItemTransformNoteDetailExchangeDto.cs @@ -6,9 +6,9 @@ namespace Win_in.Sfs.Wms.DataExchange.WMS.ItemTransformNote; public class ItemTransformNoteDetailExchangeDto { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// ERP库位 @@ -37,9 +37,9 @@ public class ItemTransformNoteDetailExchangeDto [Required(ErrorMessage = "{0}是必填项")] public string ToLocationCode { get; set; } /// - /// 目标物品代码 + /// 目标ERP料号 /// - [Display(Name = "目标物品代码")] + [Display(Name = "目标ERP料号")] public string ToItemCode { get; set; } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Items/ItemBasicAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Items/ItemBasicAppService.cs index b5a28e7d7..818f9e2fe 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Items/ItemBasicAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Items/ItemBasicAppService.cs @@ -135,7 +135,7 @@ public class ItemBasicAppService public virtual async Task GetManageTypeAsync(string itemCode) { var entity = await GetByCodeAsync(itemCode).ConfigureAwait(false); - Check.NotNull(entity, "物品代码", $"物品 {itemCode} 不存在"); + Check.NotNull(entity, "ERP料号", $"物品 {itemCode} 不存在"); return entity.ManageType; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs index 8b513d23d..df6e5544c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs @@ -172,7 +172,7 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase p.PartCode == input.PartCode && p.Code != input.Code).ConfigureAwait(false); //if (itemEntity != null) //{ - // validationRresult.Add(new ValidationResult($"物品代码{input.PartCode}已存在", new string[] { "物品代码" })); + // validationRresult.Add(new ValidationResult($"ERP料号{input.PartCode}已存在", new string[] { "ERP料号" })); //} //var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false); - ////如果类型选择为原料，校验物料号类型必须为原料，器具、KItting 的不用加校验 + ////如果类型选择为原料，校验ERP料号类型必须为原料，器具、KItting 的不用加校验 //if (input.Type == EnumRecommendType.RAW && itemBasic.Type != "10C02") //{ - // validationRresult.Add(new ValidationResult($"物品代码{input.PartCode} 物料号类型必须为原料", new string[] { "物料号类型" })); + // validationRresult.Add(new ValidationResult($"ERP料号{input.PartCode} ERP料号类型必须为原料", new string[] { "ERP料号类型" })); //} //var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false); ////如果类型选择为原料，库位的类型必须为原料库位 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PurchasePrices/PurchasePriceSheetAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PurchasePrices/PurchasePriceSheetAppService.cs index a659f09a9..5f415b7d7 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PurchasePrices/PurchasePriceSheetAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PurchasePrices/PurchasePriceSheetAppService.cs @@ -22,7 +22,7 @@ public class PurchasePriceSheetAppService : SfsBaseDataAppServiceBase - /// 根据供应零件号查询 + /// 根据供应ERP料号查询 /// /// /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SupplierItems/SupplierItemAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SupplierItems/SupplierItemAppService.cs index 5646a7e44..b49a1e2ea 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SupplierItems/SupplierItemAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SupplierItems/SupplierItemAppService.cs @@ -45,7 +45,7 @@ public class SupplierItemAppService : } /// - /// 根据物料号查询 + /// 根据ERP料号查询 /// /// /// @@ -72,7 +72,7 @@ public class SupplierItemAppService : } /// - /// 根据供应商号 和 零件号 查询 + /// 根据供应商号 和 ERP料号 查询 /// /// /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Win_in.Sfs.Basedata.Application.xml b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Win_in.Sfs.Basedata.Application.xml index e625409cc..75af3c775 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Win_in.Sfs.Basedata.Application.xml +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Win_in.Sfs.Basedata.Application.xml @@ -35,14 +35,14 @@ - 所有子物料号 + 所有子ERP料号 - 所有父物料号 + 所有父ERP料号 @@ -77,7 +77,7 @@ - 根据零件号 和 存储关系类型 获取 零件和库位关系 + 根据ERP料号 和 存储关系类型 获取 物品和库位关系 @@ -122,7 +122,7 @@ - 根据零件号 和 存储关系类型 获取 零件和库位关系 + 根据ERP料号 和 存储关系类型 获取 物品和库位关系 @@ -130,7 +130,7 @@ - 当前库位 允许的 零件关系 + 当前库位 允许的 物品关系 @@ -153,7 +153,7 @@ - 根据物料号查询 + 根据ERP料号查询 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Localization/Basedata/zh-Hans.json b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Localization/Basedata/zh-Hans.json index 409af242b..49d0b6dd4 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Localization/Basedata/zh-Hans.json +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Localization/Basedata/zh-Hans.json @@ -12,7 +12,7 @@ "AbpIdentity": "权限控制", "Warehouse": "仓库", "Area": "区域", - "AreaItem": "区域零件", + "AreaItem": "区域物品", "InterfaceCalendar": "日历接口", "Calendar": "日历", "Company": "公司", @@ -37,7 +37,7 @@ "LocationGroup": "库位组", "UserWorkGroup": "工作组", "Location": "库位", - "ItemStoreRelation": "库位零件关系维护", + "ItemStoreRelation": "库位物品关系维护", "InventoryLocationCapacity": "库位可用容量", "Workshop": "车间", "ProductionLine": "生产线", diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Areas/AreaValidator.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Areas/AreaValidator.cs index 0d701923e..19307aa2c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Areas/AreaValidator.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Areas/AreaValidator.cs @@ -25,7 +25,7 @@ public class AreaValidator : DomainService { var wrongFormat = false; - //TODO 检查物品号的格式 + //TODO 检查ERP料号的格式 if (wrongFormat) { diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/Bom.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/Bom.cs index 2250c5ae8..04a41f25e 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/Bom.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/Bom.cs @@ -18,13 +18,13 @@ public class Bom : SfsBaseDataAggregateRootBase, IHasTimeRange // public string Code { get; set; } /// - /// 父物料号 + /// 父ERP料号 /// [IgnoreUpdate] public string Product { get; set; } /// - /// 子物料号 + /// 子ERP料号 /// [IgnoreUpdate] public string Component { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs index e98b75340..00dd26ede 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs @@ -137,7 +137,7 @@ public class BomManager : DomainService, IBomManager } /// - /// 所有子物料号 + /// 所有子ERP料号 /// /// /// @@ -195,7 +195,7 @@ public class BomManager : DomainService, IBomManager var query = (await _repository.GetDbSetAsync().ConfigureAwait(false)).AsNoTracking().Where(where); Console.WriteLine(query.ToString()); var phantomItemBoms = await query.ToListAsync().ConfigureAwait(false); - //递归获取下层BOM的子零件为虚零件的BOM + //递归获取下层BOM的子物品为虚物品的BOM var nextLevelBoms = await GetPhantomItemBomsAsync(phantomItemBoms, mfgOp, validTime, onlyFromProductionPlan).ConfigureAwait(false); result.AddRange(nextLevelBoms); } @@ -208,7 +208,7 @@ public class BomManager : DomainService, IBomManager } /// - /// 所有父物料号 + /// 所有父ERP料号 /// /// /// @@ -304,7 +304,7 @@ public class BomManager : DomainService, IBomManager /// 层级一般为1 /// 累计数量 /// 根 - /// 拆解到最终零件时 + /// 拆解到最终物品时 /// 树型转成一维表用 /// /// @@ -314,17 +314,17 @@ public class BomManager : DomainService, IBomManager /* ,List bomList =null*/ ) { - // 初始化子零件列表 + // 初始化子物品列表 List subComponents = new List(); - // 假设 GetComponentsByProduct 方法可获取某个物料号下的所有子零件 + // 假设 GetComponentsByProduct 方法可获取某个ERP料号下的所有子物品 List directSubComponents = await GetComponentsByProduct(p_component.Component).ConfigureAwait(false); - // 如果没有直接子零件且不是根元素，则执行最后操作回调函数 + // 如果没有直接子物品且不是根元素，则执行最后操作回调函数 if (!directSubComponents.Any() && level != 1) { p_actionLast(p_component); } - // 遍历直接子零件列表 + // 遍历直接子物品列表 foreach (var component in directSubComponents) { // 设置根元素和数量 @@ -334,13 +334,13 @@ public class BomManager : DomainService, IBomManager component.Level = level; // 设置拆解路径 component.Path = (p_component.Component != root) ? p_component.Path + $"->{component.Component}" : p_component.Component + $"->{component.Component}"; - // 递归获取子零件列表，并执行维度操作回调函数 + // 递归获取子物品列表，并执行维度操作回调函数 component.SubComponents = await GetSubcomponentsRecursive(component, level + 1, sumQty * component.ComponentQty, component.Root, p_actionLast, p_actionDimension).ConfigureAwait(false); p_actionDimension(component); - // 添加子零件到子零件列表 + // 添加子物品到子物品列表 subComponents.Add(component); } - // 返回子零件列表 + // 返回子物品列表 return subComponents; } @@ -369,7 +369,7 @@ public class BomManager : DomainService, IBomManager bomComponent.InjectFrom(component); components.Add(bomComponent); } - // 其他物料号的子零件信息类似添加 + // 其他ERP料号的子物品信息类似添加 return components; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs index b58ebea14..7e2ab44c1 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs @@ -20,14 +20,14 @@ public interface IBomManager : IDomainService, IBulkImportService Task> GetRecursiveListAsync(string productItemCode, DateTime validTime, bool isRecursive = true); /// - /// 所有父物料号 + /// 所有父ERP料号 /// /// /// Task> GetListOfComponentAsync(string component); /// - /// 所有子物料号 + /// 所有子ERP料号 /// /// /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/CustomerItems/CustomerItem.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/CustomerItems/CustomerItem.cs index d4745c9fb..bcb5a8fbe 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/CustomerItems/CustomerItem.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/CustomerItems/CustomerItem.cs @@ -20,13 +20,13 @@ public class CustomerItem : SfsBaseDataAggregateRootBase, IHasTimeRange public string CustomerCode { get; set; } /// - /// 物料号 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } /// - /// 客户物料号 + /// 客户ERP料号 /// public string CustomerItemCode { get; set; } @@ -58,13 +58,13 @@ public class CustomerItem : SfsBaseDataAggregateRootBase, IHasTimeRange public DateTime? EndTime { get; set; } /// - /// 客户零件库位 + /// 客户物品库位 /// public string LocationCode { get; set; } } ///// -///// 客户零件 +///// 客户物品 ///// //public class CustomerItem : SfsBaseDataAggregateRootBase //{ @@ -86,9 +86,9 @@ public class CustomerItem : SfsBaseDataAggregateRootBase, IHasTimeRange // public Guid CustomerId { get; internal set; } // /// -// /// 客户物品代码 +// /// 客户ERP料号 // /// -// [Display(Name = "客户物品代码")] +// [Display(Name = "客户ERP料号")] // [Required(ErrorMessage = "{0}是必填项")] // [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] // public string Code { get; internal set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentArea.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentArea.cs index 9824ea62f..3a345b316 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentArea.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentArea.cs @@ -159,7 +159,7 @@ public class EquipmentArea : SfsBaseDataAggregateRootBase, IHasCode //public string Elevel { get; set; } ///// - ///// 虚零件 + ///// 虚物品 ///// //public virtual bool IsPhantom { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentLocCap.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentLocCap.cs index facd32dde..d89d57774 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentLocCap.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentLocCap.cs @@ -15,7 +15,7 @@ public class EquipmentLocCap:SfsAggregateRootBase, IHasCode /// public string Code { get; set; } /// - /// 零件号 + /// ERP料号 /// public string PartCode { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentPartCode.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentPartCode.cs index 27834ba14..f61a08a22 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentPartCode.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentPartCode.cs @@ -8,7 +8,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Basedata; namespace Win_in.Sfs.Basedata.Domain; /// -/// 器具零件关系信息 +/// 器具物品关系信息 /// public class EquipmentPartCode : SfsBaseDataAggregateRootBase, IHasCode { diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentValidator.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentValidator.cs index 6d94580b4..6c1c02e23 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentValidator.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/EquipmentValidator.cs @@ -23,7 +23,7 @@ namespace Win_in.Sfs.Basedata.Domain; // { // var wrongFormat = false; -// //TODO 检查物品号的格式 +// //TODO 检查ERP料号的格式 // if (wrongFormat) // { diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ErpLocationItems/ErpLocationItem.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ErpLocationItems/ErpLocationItem.cs index c28ccc858..c985bca31 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ErpLocationItems/ErpLocationItem.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ErpLocationItems/ErpLocationItem.cs @@ -6,7 +6,7 @@ namespace Win_in.Sfs.Basedata.Domain; public class ErpLocationItem : SfsBaseDataAggregateRootBase { /// - /// 物料代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemBasics/ItemBasic.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemBasics/ItemBasic.cs index b46e90c6a..c7218562b 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemBasics/ItemBasic.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemBasics/ItemBasic.cs @@ -109,7 +109,7 @@ public class ItemBasic : SfsBaseDataAggregateRootBase, IHasCode, IHasName public string Elevel { get; set; } /// - /// 虚零件 + /// 虚物品 /// public virtual bool IsPhantom { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemBasics/ItemValidator.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemBasics/ItemValidator.cs index 14e4b2174..e6724d9c0 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemBasics/ItemValidator.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemBasics/ItemValidator.cs @@ -23,7 +23,7 @@ public class ItemValidator : DomainService { var wrongFormat = false; - //TODO 检查物品号的格式 + //TODO 检查ERP料号的格式 if (wrongFormat) { diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemCategories/ItemCategory.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemCategories/ItemCategory.cs index 3609693aa..bb5aceafc 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemCategories/ItemCategory.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemCategories/ItemCategory.cs @@ -5,7 +5,7 @@ namespace Win_in.Sfs.Basedata.Domain; public class ItemCategory : SfsBaseDataAggregateRootBase { /// - /// 物品代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemContainers/ItemContainer.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemContainers/ItemContainer.cs index 152586dce..c2beb0dd0 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemContainers/ItemContainer.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemContainers/ItemContainer.cs @@ -20,7 +20,7 @@ public class ItemContainer : SfsBaseDataAggregateRootBase /// - /// 物品代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemPacks/ItemPack.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemPacks/ItemPack.cs index 5a8fc21ed..e3d7e25ed 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemPacks/ItemPack.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemPacks/ItemPack.cs @@ -24,7 +24,7 @@ public class ItemPack : SfsBaseDataAggregateRootBase public string PackType { get; set; } /// - /// 物品代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemSafetyStocks/ItemSafetyStock.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemSafetyStocks/ItemSafetyStock.cs index 532cf61b8..59731b4e3 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemSafetyStocks/ItemSafetyStock.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemSafetyStocks/ItemSafetyStock.cs @@ -6,7 +6,7 @@ namespace Win_in.Sfs.Basedata.Domain; public class ItemSafetyStock : SfsBaseDataAggregateRootBase { /// - /// 物品代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemStoreRelations/ItemStoreRelation.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemStoreRelations/ItemStoreRelation.cs index 54fed343c..055fa6ecc 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemStoreRelations/ItemStoreRelation.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemStoreRelations/ItemStoreRelation.cs @@ -6,7 +6,7 @@ namespace Win_in.Sfs.Basedata.Domain; public class ItemStoreRelation : SfsBaseDataAggregateRootBase { /// - /// 物品代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Locations/LocationValidator.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Locations/LocationValidator.cs index e1178cf55..58dfb85ca 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Locations/LocationValidator.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Locations/LocationValidator.cs @@ -16,7 +16,7 @@ public class LocationValidator : DomainService { var wrongFormat = false; - //TODO 检查物品号的格式 + //TODO 检查ERP料号的格式 if (wrongFormat) { diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCodes/PositionCode.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCodes/PositionCode.cs index 9a0651fea..74742ebab 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCodes/PositionCode.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCodes/PositionCode.cs @@ -16,9 +16,9 @@ public class PositionCode : SfsBaseDataAggregateRootBase, IHasCode [Display(Name = "位置代码")] public string Code { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string PartCode { get; set; } /// /// 物料名称 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ProductionLineItems/ProductionLineItem.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ProductionLineItems/ProductionLineItem.cs index 649f0a8c1..5e65d112a 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ProductionLineItems/ProductionLineItem.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ProductionLineItems/ProductionLineItem.cs @@ -20,9 +20,9 @@ public class ProductionLineItem : SfsBaseDataAggregateRootBase public string ProdLineCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PurchasePrices/PurchasePriceSheet.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PurchasePrices/PurchasePriceSheet.cs index c0136e6fc..76db51fe6 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PurchasePrices/PurchasePriceSheet.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PurchasePrices/PurchasePriceSheet.cs @@ -10,7 +10,7 @@ namespace Win_in.Sfs.Basedata.Domain; public class PurchasePriceSheet : SfsBaseDataAggregateRootBase { /// - /// 物品代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SalePrices/SalePriceSheet.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SalePrices/SalePriceSheet.cs index 785f7496e..b76ad6c02 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SalePrices/SalePriceSheet.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SalePrices/SalePriceSheet.cs @@ -16,7 +16,7 @@ public class SalePriceSheet : SfsBaseDataAggregateRootBase public string CustomerCode { get; set; } /// - /// 物料号 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } 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 5937bd856..7a3f427cd 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 @@ -81,7 +81,7 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase public decimal ToQty { get; set; } /// - /// 物料号 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/StdCostPrices/StdCostPriceSheet.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/StdCostPrices/StdCostPriceSheet.cs index c3306bbd5..ce9783bbd 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/StdCostPrices/StdCostPriceSheet.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/StdCostPrices/StdCostPriceSheet.cs @@ -11,7 +11,7 @@ namespace Win_in.Sfs.Basedata.Domain; public class StdCostPriceSheet : SfsBaseDataAggregateRootBase { /// - /// 物品代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SupplierItems/SupplierItem.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SupplierItems/SupplierItem.cs index 6f0f40104..7c73e29cf 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SupplierItems/SupplierItem.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SupplierItems/SupplierItem.cs @@ -22,18 +22,18 @@ public class SupplierItem : SfsBaseDataAggregateRootBase public string SupplierSimpleName { get; set; } /// - /// 物料号 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } /// - /// 物料号名称 + /// ERP料号名称 /// public string ItemName { get; set; } /// - /// 供应商物料号 + /// 供应商ERP料号 /// public string SupplierItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceDTO.cs index bcbd6f810..5dacfe229 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceDTO.cs @@ -44,9 +44,9 @@ public class BalanceDTO : SfsBasicDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceSummaryDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceSummaryDTO.cs index 949f88d61..b7ed9f2b6 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceSummaryDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/DTOs/BalanceSummaryDTO.cs @@ -12,9 +12,9 @@ public class BalanceSummaryDTO : EntityDto { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// 库位代码 diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/IBalanceAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/IBalanceAppService.cs index 208501c60..4fc6aa103 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/IBalanceAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/IBalanceAppService.cs @@ -115,7 +115,7 @@ public interface IBalanceAppService Task> GetListByLocationCodeAndStatusAsync(string locationCode, EnumInventoryStatus status); /// - /// 不可用 根据 库位 零件 箱码 批次 状态 + /// 不可用 根据 库位 物品 箱码 批次 状态 /// /// /// @@ -131,7 +131,7 @@ public interface IBalanceAppService EnumInventoryStatus status); /// - /// 设置为可用 根据 库位 零件 箱码 批次 状态 + /// 设置为可用 根据 库位 物品 箱码 批次 状态 /// /// /// @@ -152,7 +152,7 @@ public interface IBalanceAppService Task UpdateItemBasicInfoAsync(BalanceUpdateItemBasicInfoDto balanceUpdateItemBasicInfoDto); /// - /// 获取【库存】根据 库位代码 和 物品代码 + /// 获取【库存】根据 库位代码 和 ERP料号 /// /// /// diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceEditInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceEditInput.cs index e22705e27..a781acaee 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceEditInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceEditInput.cs @@ -44,9 +44,9 @@ public class BalanceEditInput : SfsInventoryCreateUpdateInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceManyParameterRequestInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceManyParameterRequestInput.cs index f36ca3647..8eb4e7589 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceManyParameterRequestInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceManyParameterRequestInput.cs @@ -31,9 +31,9 @@ public class BalanceManyParameterRequestInput public string Lot { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceRequest.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceRequest.cs index 2856ff8da..70eae9b44 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceRequest.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/BalanceRequest.cs @@ -24,9 +24,9 @@ public class BalanceRequest public string PackingCode { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/RecommendBalanceRequestInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/RecommendBalanceRequestInput.cs index 885083272..449cee8a9 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/RecommendBalanceRequestInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Balances/Inputs/RecommendBalanceRequestInput.cs @@ -8,9 +8,9 @@ namespace Win_in.Sfs.Wms.Inventory.Application.Contracts; public class RecommendBalanceRequestInput { /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// 到货数量 @@ -54,6 +54,6 @@ public class RecommendBalanceRequestInput // var locationAreas = LocationAreas.JoinAsString(","); // var statuses = Statuses.Aggregate("", (current, status) => current + (status.GetDisplayName() + ",")); - // return $"物料号：{ItemCode}, 数量：{Qty}, 库位类型：{locationTypes}, 库区:{locationAreas}, 库存状态：{statuses}."; + // return $"ERP料号：{ItemCode}, 数量：{Qty}, 库位类型：{locationTypes}, 库区:{locationAreas}, 库存状态：{statuses}."; //} } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Containers/DTOs/ContainerDetailDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Containers/DTOs/ContainerDetailDTO.cs index e437556b3..48d35b8b1 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Containers/DTOs/ContainerDetailDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Containers/DTOs/ContainerDetailDTO.cs @@ -48,9 +48,9 @@ public class ContainerDetailDTO : SfsDetailDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Containers/Inputs/ContainerDetailInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Containers/Inputs/ContainerDetailInput.cs index af5921b48..dd5483ac0 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Containers/Inputs/ContainerDetailInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Containers/Inputs/ContainerDetailInput.cs @@ -49,9 +49,9 @@ public class ContainerDetailInput : SfsDetailInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ErpBalances/DTOs/ErpBalanceDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ErpBalances/DTOs/ErpBalanceDTO.cs index a2d9780d6..d068f40ea 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ErpBalances/DTOs/ErpBalanceDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ErpBalances/DTOs/ErpBalanceDTO.cs @@ -13,9 +13,9 @@ public class ErpBalanceDTO : SfsBasicDTOBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ErpBalances/Inputs/ErpBalanceEditInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ErpBalances/Inputs/ErpBalanceEditInput.cs index 1ebe70305..72572808d 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ErpBalances/Inputs/ErpBalanceEditInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ErpBalances/Inputs/ErpBalanceEditInput.cs @@ -48,9 +48,9 @@ public class ErpBalanceEditInput #region Create /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectIns/DTOs/ExpectInDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectIns/DTOs/ExpectInDTO.cs index 9520c230d..b90ccf974 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectIns/DTOs/ExpectInDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectIns/DTOs/ExpectInDTO.cs @@ -44,9 +44,9 @@ public class ExpectInDTO : SfsBasicDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectIns/Inputs/ExpectInEditInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectIns/Inputs/ExpectInEditInput.cs index 463d19bec..6d1df22f9 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectIns/Inputs/ExpectInEditInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectIns/Inputs/ExpectInEditInput.cs @@ -39,9 +39,9 @@ public class ExpectInEditInput : SfsInventoryCreateUpdateInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/DTOs/ExpectOutDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/DTOs/ExpectOutDTO.cs index 8c7806863..ddc111389 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/DTOs/ExpectOutDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/DTOs/ExpectOutDTO.cs @@ -44,9 +44,9 @@ public class ExpectOutDTO : SfsBasicDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/Inputs/ExpectOutEditInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/Inputs/ExpectOutEditInput.cs index 7f77bfe0b..289bd263d 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/Inputs/ExpectOutEditInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/Inputs/ExpectOutEditInput.cs @@ -44,9 +44,9 @@ public class ExpectOutEditInput : SfsInventoryCreateUpdateInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/SafetyStockBalances/DTOs/SafetyStockBalancesDto.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/SafetyStockBalances/DTOs/SafetyStockBalancesDto.cs index 708f52d0c..5ee2d5408 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/SafetyStockBalances/DTOs/SafetyStockBalancesDto.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/SafetyStockBalances/DTOs/SafetyStockBalancesDto.cs @@ -14,9 +14,9 @@ namespace Win_in.Sfs.Wms.Inventory; public class SafetyStockBalancesDto: SfsBasicDTOBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Snapshots/DTOs/SnapshotDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Snapshots/DTOs/SnapshotDTO.cs index 47b58b82c..2c790b38b 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Snapshots/DTOs/SnapshotDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Snapshots/DTOs/SnapshotDTO.cs @@ -53,9 +53,9 @@ public class SnapshotDTO : SfsBasicDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Snapshots/Inputs/SnapshotEditInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Snapshots/Inputs/SnapshotEditInput.cs index e5208006d..015d29353 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Snapshots/Inputs/SnapshotEditInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Snapshots/Inputs/SnapshotEditInput.cs @@ -54,9 +54,9 @@ public class SnapshotEditInput : SfsInventoryCreateUpdateInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Transactions/DTOs/TransactionDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Transactions/DTOs/TransactionDTO.cs index a03168a53..a16fa98ee 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Transactions/DTOs/TransactionDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Transactions/DTOs/TransactionDTO.cs @@ -68,9 +68,9 @@ public class TransactionDTO : SfsBasicDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Transactions/Inputs/TransactionEditInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Transactions/Inputs/TransactionEditInput.cs index f26f754a6..cbda77bb8 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Transactions/Inputs/TransactionEditInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/Transactions/Inputs/TransactionEditInput.cs @@ -54,9 +54,9 @@ public class TransactionEditInput : SfsInventoryCreateUpdateInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/TransferLogs/DTOs/TransferLogDTO.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/TransferLogs/DTOs/TransferLogDTO.cs index 795ae53f6..f87499be6 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/TransferLogs/DTOs/TransferLogDTO.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/TransferLogs/DTOs/TransferLogDTO.cs @@ -57,9 +57,9 @@ public class TransferLogDTO : SfsBasicDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/TransferLogs/Inputs/TransferLogEditInput.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/TransferLogs/Inputs/TransferLogEditInput.cs index ad3b7d08f..982f263a7 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/TransferLogs/Inputs/TransferLogEditInput.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/TransferLogs/Inputs/TransferLogEditInput.cs @@ -51,9 +51,9 @@ public class TransferLogEditInput : SfsCreateOrUpdateInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs index c31bd3595..ff20cc1b6 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs @@ -245,7 +245,7 @@ public class BalanceAppService } /// - /// 设置为不可用 根据 库位 零件 箱码 批次 状态 + /// 设置为不可用 根据 库位 物品 箱码 批次 状态 /// /// /// @@ -274,7 +274,7 @@ public class BalanceAppService } /// - /// 设置为可用 根据 库位 零件 箱码 批次 状态 + /// 设置为可用 根据 库位 物品 箱码 批次 状态 /// /// /// @@ -302,7 +302,7 @@ public class BalanceAppService } } /// - /// 设置为可用 根据 库位 零件 箱码 批次 状态 + /// 设置为可用 根据 库位 物品 箱码 批次 状态 /// /// /// @@ -405,7 +405,7 @@ public class BalanceAppService .ConfigureAwait(false); if (entity == null) { - throw new UserFriendlyException($"未找到箱码为 {packingCode}，物料代码为 {itemCode}，库位代码为 {locationCode} 的库存"); + throw new UserFriendlyException($"未找到箱码为 {packingCode}，ERP料号为 {itemCode}，库位代码为 {locationCode} 的库存"); } var dto = ObjectMapper.Map(entity); @@ -430,7 +430,7 @@ public class BalanceAppService c.Status == status).ConfigureAwait(false); if (entity == null) { - throw new UserFriendlyException($"未找到箱码为 {packingCode}，物料代码为 {itemCode}，库位代码为 {locationCode} 的库存"); + throw new UserFriendlyException($"未找到箱码为 {packingCode}，ERP料号为 {itemCode}，库位代码为 {locationCode} 的库存"); } var dto = ObjectMapper.Map(entity); @@ -494,7 +494,7 @@ public class BalanceAppService if (entity == null) { throw new UserFriendlyException( - $"未找到箱码为 {packingCode}，物料代码为 {itemCode}，库位代码为 {locationCode},状态为为 {status} 的库存"); + $"未找到箱码为 {packingCode}，ERP料号为 {itemCode}，库位代码为 {locationCode},状态为为 {status} 的库存"); } var dto = ObjectMapper.Map(entity); @@ -524,7 +524,7 @@ public class BalanceAppService } /// - /// 获取【库存】根据 库位代码 和 物品代码 + /// 获取【库存】根据 库位代码 和 ERP料号 /// /// /// @@ -540,7 +540,7 @@ public class BalanceAppService } /// - /// 获取【库存】根据 库位代码 和 物品代码 + /// 获取【库存】根据 库位代码 和 ERP料号 /// /// /// @@ -719,7 +719,7 @@ public class BalanceAppService } /// - /// 查询库存余额 根据 状态集合 库位类别集合 物品代码 箱码 托码 批次 库位 + /// 查询库存余额 根据 状态集合 库位类别集合 ERP料号 箱码 托码 批次 库位 /// /// /// @@ -894,7 +894,7 @@ public class BalanceAppService c.Status == status).ConfigureAwait(false); if (entity == null) { - throw new UserFriendlyException($"未找到箱码为 {packingCode}，物料代码为 {itemCode}，库位代码为 {locationCode} 的库存"); + throw new UserFriendlyException($"未找到箱码为 {packingCode}，ERP料号为 {itemCode}，库位代码为 {locationCode} 的库存"); } var expectOutDtos=await _expectOutAppService.GetListByItemCodeAndStatusAndPackingCodeAsync(itemCode,locationCode,packingCode,status,lot).ConfigureAwait(false); diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectIns/ExpectInAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectIns/ExpectInAppService.cs index bc0a76d65..e7e7c3966 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectIns/ExpectInAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectIns/ExpectInAppService.cs @@ -78,7 +78,7 @@ public class ExpectInAppService } /// - /// 根据物料代码获取预计入库存 + /// 根据ERP料号获取预计入库存 /// /// /// diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs index efbf3d6c5..09a33b421 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs @@ -162,7 +162,7 @@ public class ExpectOutAppService } /// - /// 根据物料代码获取预计出库存 + /// 根据ERP料号获取预计出库存 /// /// /// diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Transactions/TransactionAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Transactions/TransactionAppService.cs index 274977bc1..fc1656535 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Transactions/TransactionAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Transactions/TransactionAppService.cs @@ -188,7 +188,7 @@ public class TransactionAppService var itemBasicDto = allItemBasicDtos.FirstOrDefault(p=>p.Code== itemCode); if (itemBasicDto==null) { - throw new UserFriendlyException($"物品代码{itemCode}不存在"); + throw new UserFriendlyException($"ERP料号{itemCode}不存在"); } itemSerialDto.ItemCode = itemBasicDto.Code; @@ -197,7 +197,7 @@ public class TransactionAppService itemSerialDto.Configuration = itemBasicDto.Configuration; itemSerialDto.ItemName = itemBasicDto.Name; - //所有这个零件的事务 + //所有这个物品的事务 var transactions = allTransactions.Where(p => p.ItemCode == itemCode); if (!string.IsNullOrEmpty(erpLocationCode)) { diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Win_in.Sfs.Wms.Inventory.Application.xml b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Win_in.Sfs.Wms.Inventory.Application.xml index 53957618c..fbc6c11f1 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Win_in.Sfs.Wms.Inventory.Application.xml +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Win_in.Sfs.Wms.Inventory.Application.xml @@ -116,7 +116,7 @@ - 获取【库存】根据 库位代码 和 物品代码 + 获取【库存】根据 库位代码 和 ERP料号 @@ -139,7 +139,7 @@ - 查询库存余额 根据 状态集合 库位类别集合 物品代码 箱码 托码 批次 库位 + 查询库存余额 根据 状态集合 库位类别集合 ERP料号 箱码 托码 批次 库位 @@ -227,7 +227,7 @@ - 根据物料代码获取预计入库存 + 根据ERP料号获取预计入库存 @@ -256,7 +256,7 @@ - 根据物料代码获取预计出库存 + 根据ERP料号获取预计出库存 diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Acl/ItemBasic/ItemBasicAclService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Acl/ItemBasic/ItemBasicAclService.cs index e4c94215f..3a03aa585 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Acl/ItemBasic/ItemBasicAclService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Acl/ItemBasic/ItemBasicAclService.cs @@ -37,7 +37,7 @@ public class ItemBasicAclService private async Task GetFromAppServiceAsync(string itemCode) { var item = await _appService.GetByCodeAsync(itemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", $"物品 {itemCode} 不存在"); + Check.NotNull(item, "ERP料号", $"物品 {itemCode} 不存在"); return item; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Shared/Localization/Inventory/zh-Hans.json b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Shared/Localization/Inventory/zh-Hans.json index 409af242b..49d0b6dd4 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Shared/Localization/Inventory/zh-Hans.json +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Shared/Localization/Inventory/zh-Hans.json @@ -12,7 +12,7 @@ "AbpIdentity": "权限控制", "Warehouse": "仓库", "Area": "区域", - "AreaItem": "区域零件", + "AreaItem": "区域物品", "InterfaceCalendar": "日历接口", "Calendar": "日历", "Company": "公司", @@ -37,7 +37,7 @@ "LocationGroup": "库位组", "UserWorkGroup": "工作组", "Location": "库位", - "ItemStoreRelation": "库位零件关系维护", + "ItemStoreRelation": "库位物品关系维护", "InventoryLocationCapacity": "库位可用容量", "Workshop": "车间", "ProductionLine": "生产线", diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Shared/Settings/InventorySettingDefinitionProvider.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Shared/Settings/InventorySettingDefinitionProvider.cs index 514c70d2a..ace35d5b9 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Shared/Settings/InventorySettingDefinitionProvider.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain.Shared/Settings/InventorySettingDefinitionProvider.cs @@ -18,7 +18,7 @@ public class InventorySettingDefinitionProvider : SettingDefinitionProvider "5", LocalizableString.Create(InventorySettings.Cache.Minutes)), - //是否在计算库存容量时忽略没有映射关系的零件 + //是否在计算库存容量时忽略没有映射关系的物品 new SettingDefinition( InventorySettings.LocationCapacity.IgnoreNullItemStoreRelation, "true", diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/Balance.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/Balance.cs index f8d05b5f5..783919cb9 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/Balance.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/Balance.cs @@ -45,7 +45,7 @@ public class Balance : SfsInventoryAggregateRootBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/BalanceManager.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/BalanceManager.cs index ec2e68842..db0162c61 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/BalanceManager.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/BalanceManager.cs @@ -152,7 +152,7 @@ public class BalanceManager : DomainService, IBalanceManager if (itemStoreRelation == null) { - throw new UserFriendlyException($"未找到零件【{transaction.ItemCode}】与库位【{transaction.LocationCode}】的映射关系"); + throw new UserFriendlyException($"未找到物品【{transaction.ItemCode}】与库位【{transaction.LocationCode}】的映射关系"); } } /// @@ -167,7 +167,7 @@ public class BalanceManager : DomainService, IBalanceManager if (erpLocationItem == null) { - throw new UserFriendlyException($"未找到零件【{transaction.ItemCode}】与ERP储位【{transaction.LocationErpCode}】的开账信息"); + throw new UserFriendlyException($"未找到物品【{transaction.ItemCode}】与ERP储位【{transaction.LocationErpCode}】的开账信息"); } } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/LocationValidator.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/LocationValidator.cs index 4f0f481f3..8c10ba8bd 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/LocationValidator.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Balances/LocationValidator.cs @@ -15,7 +15,7 @@ public class LocationValidator { var wrongFormat = false; - //TODO 检查物品号的格式 + //TODO 检查ERP料号的格式 if (wrongFormat) { diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Containers/ContainerDetail.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Containers/ContainerDetail.cs index a61cdd559..05f41f917 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Containers/ContainerDetail.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Containers/ContainerDetail.cs @@ -42,7 +42,7 @@ public class ContainerDetail : SfsInventoryDetailEntityBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ErpBalances/ErpBalance.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ErpBalances/ErpBalance.cs index 5245295e7..a2d8d2acb 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ErpBalances/ErpBalance.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ErpBalances/ErpBalance.cs @@ -15,7 +15,7 @@ public class ErpBalance : SfsAggregateRootBase { /// - /// 物品代码 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ExpectIns/ExpectIn.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ExpectIns/ExpectIn.cs index 13d976d5c..d9a07fd2c 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ExpectIns/ExpectIn.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ExpectIns/ExpectIn.cs @@ -41,7 +41,7 @@ public class ExpectIn : SfsInventoryAggregateRootBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ExpectOuts/ExpectOut.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ExpectOuts/ExpectOut.cs index ee380d55d..d639be859 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ExpectOuts/ExpectOut.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/ExpectOuts/ExpectOut.cs @@ -40,7 +40,7 @@ public class ExpectOut : SfsInventoryAggregateRootBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/LocationCapacitys/LocationCapacityManager.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/LocationCapacitys/LocationCapacityManager.cs index c0af8e604..401572159 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/LocationCapacitys/LocationCapacityManager.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/LocationCapacitys/LocationCapacityManager.cs @@ -130,7 +130,7 @@ public class LocationCapacityManager : DomainService, ILocationCapacityManager if (requireCapacity > 1 + locationCapacity.BearableOverloadCapacity) { throw new UserFriendlyException( - $"需求容量 {requireCapacity:P} 超过库位可承载容量，请检查库位 {locationCode} 的零件库位关系配置是否正确。"); + $"需求容量 {requireCapacity:P} 超过库位可承载容量，请检查库位 {locationCode} 的物品库位关系配置是否正确。"); } //如果 ( 需求容量 > 可用容量 + 可承受过载容量）此库位将无法放入此库存 @@ -559,7 +559,7 @@ var itemCodesOfExpectInInventories = expectInInventories.Select(p => p.ItemCode) itemCodes.AddIfNotContains(itemCodesOfExpectInInventories); -if (itemCodes.All(p => p != itemCode)) //如果该零件 不存在于现有的库存和预填充中 就创建1个虚拟的 预填充记录 去进行计算 +if (itemCodes.All(p => p != itemCode)) //如果该物品 不存在于现有的库存和预填充中 就创建1个虚拟的 预填充记录 去进行计算 { var tempExpectInInventory = new ExpectIn { @@ -881,7 +881,7 @@ return sumQty; } /// -/// 获取当前零件的在库位的剩余可用量 +/// 获取当前物品的在库位的剩余可用量 /// 返回值的数字是根据存储方式返回的 /// 例如传入的是箱返回的就是剩余可用箱数 预填充+库存余额 /// @@ -899,7 +899,7 @@ var locationCapacity = var itemStoreRelation = await _itemStoreRelationAppService.GetByItemAndLocationAsync(itemCode, locationCode); -//该零件的存储单位已用量 +//该物品的存储单位已用量 var sumQty = await GetTotalQtyOfItemInLocationAsync(itemCode, locationCode, itemStoreRelation.PramaryUM, expectIninventories); if (itemStoreRelation.UmQty - sumQty <= 0) diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Snapshots/Snapshot.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Snapshots/Snapshot.cs index 6668fede0..c329258c1 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Snapshots/Snapshot.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Snapshots/Snapshot.cs @@ -50,7 +50,7 @@ public class Snapshot : SfsInventoryAggregateRootBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Transactions/Transaction.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Transactions/Transaction.cs index 3414f7104..6610d8108 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Transactions/Transaction.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Transactions/Transaction.cs @@ -103,7 +103,7 @@ public class Transaction : SfsInventoryAggregateRootBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Transactions/TransactionExtensions.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Transactions/TransactionExtensions.cs index 9699c272a..3acbe303c 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Transactions/TransactionExtensions.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/Transactions/TransactionExtensions.cs @@ -32,7 +32,7 @@ public static class TransactionExtensions { throw new UserFriendlyException($"{location.Code} 库位不允许负库存。{Environment.NewLine}" + $"箱码: {transaction.PackingCode}{Environment.NewLine}" + - $"物料号: {transaction.ItemCode}{Environment.NewLine}" + + $"ERP料号: {transaction.ItemCode}{Environment.NewLine}" + $"批次: {transaction.Lot}{Environment.NewLine}" + $"状态: {transaction.Status}{Environment.NewLine}" + $"出库数量 {transaction.Qty}{Environment.NewLine}" + diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/TransferLogs/TransferLog.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/TransferLogs/TransferLog.cs index b5f08598e..c80ba5569 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/TransferLogs/TransferLog.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/TransferLogs/TransferLog.cs @@ -53,7 +53,7 @@ public class TransferLog : SfsInventoryAggregateRootBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/TransferLogs/TransferLogManager.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/TransferLogs/TransferLogManager.cs index cd6693d50..616b564fa 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/TransferLogs/TransferLogManager.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Domain/TransferLogs/TransferLogManager.cs @@ -44,7 +44,7 @@ public class TransferLogManager : DomainService, ITransferLogManager public virtual async Task AddAsync(TransferLog transferLog) { - // 同一个零件不是唯一索引中的值 会造成out删除 in增加时 in能查到原纪录 + // 同一个物品不是唯一索引中的值 会造成out删除 in增加时 in能查到原纪录 if (transferLog.FromLocationCode == transferLog.ToLocationCode && transferLog.FromPackingCode == transferLog.ToPackingCode && transferLog.FromLot == transferLog.ToLot @@ -121,7 +121,7 @@ public class TransferLogManager : DomainService, ITransferLogManager //2. 添加TransferLogs await _transferLogRepository.InsertManyAsync(transferLogs).ConfigureAwait(false); - //3. Transactions按箱码，零件号，批次，库位，状态汇总数量，将需要对冲的明细对冲掉 + //3. Transactions按箱码，ERP料号，批次，库位，状态汇总数量，将需要对冲的明细对冲掉 var compactTransactions = new List(); foreach (var transaction in transactions) { diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelDto.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelDto.cs index ffda20f6b..6895e1465 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelDto.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelDto.cs @@ -38,9 +38,9 @@ public class InventoryLabelDto : SfsBasicDTOBase public string FullBarcodeString { get; set; } /// - /// 物品号 + /// ERP料号 /// - [Display(Name = "物品号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// @@ -204,15 +204,15 @@ public class InventoryLabelDto : SfsBasicDTOBase public string SupplierSimpleName { get; set; } /// - /// 供应商零件号 + /// 供应商ERP料号 /// - [Display(Name = "供应商零件号")] + [Display(Name = "供应商ERP料号")] public string SupplierItemCode { get; set; } /// - /// 供应商零件名 + /// 供应商物品名 /// - [Display(Name = "供应商零件名")] + [Display(Name = "供应商物品名")] public string SupplierItemName { get; set; } /// diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelEditInput.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelEditInput.cs index facf0ad7a..308b62cba 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelEditInput.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelEditInput.cs @@ -23,9 +23,9 @@ public class InventoryLabelEditInput : SfsLabelCreateOrUpdateInputBase public string FullBarcodeString { get; set; } /// - /// 物品号 + /// ERP料号 /// - [Display(Name = "物品号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } @@ -193,15 +193,15 @@ public class InventoryLabelEditInput : SfsLabelCreateOrUpdateInputBase public string SupplierSimpleName { get; set; } /// - /// 供应商零件号 + /// 供应商ERP料号 /// - [Display(Name = "供应商零件号")] + [Display(Name = "供应商ERP料号")] public string SupplierItemCode { get; set; } /// - /// 供应商零件名 + /// 供应商物品名 /// - [Display(Name = "供应商零件名")] + [Display(Name = "供应商物品名")] public string SupplierItemName { get; set; } #endregion diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelImportInput.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelImportInput.cs index 78e0282ae..130821fb9 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelImportInput.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelImportInput.cs @@ -30,9 +30,9 @@ public class InventoryLabelImportInput : SfsImportInputBase public string Code { get; set; } /// - /// 物品号 + /// ERP料号 /// - [Display(Name = "物品号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } @@ -108,9 +108,9 @@ public class InventoryLabelImportInput : SfsImportInputBase public string AsnNumber { get; set; } /// - /// 供应商零件号 + /// 供应商ERP料号 /// - [Display(Name = "供应商零件号")] + [Display(Name = "供应商ERP料号")] public string SupplierItemCode { get; set; } /// diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelWithoutCodeCreateInput.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelWithoutCodeCreateInput.cs index 723b2350c..31d82d26e 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelWithoutCodeCreateInput.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/InventoryLabels/InventoryLabelWithoutCodeCreateInput.cs @@ -13,9 +13,9 @@ public class InventoryLabelWithoutCodeCreateInput public string FullBarcodeString { get; set; } /// - /// 物品号 + /// ERP料号 /// - [Display(Name = "物品号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } @@ -183,15 +183,15 @@ public class InventoryLabelWithoutCodeCreateInput public string SupplierSimpleName { get; set; } /// - /// 供应商零件号 + /// 供应商ERP料号 /// - [Display(Name = "供应商零件号")] + [Display(Name = "供应商ERP料号")] public string SupplierItemCode { get; set; } /// - /// 供应商零件名 + /// 供应商物品名 /// - [Display(Name = "供应商零件名")] + [Display(Name = "供应商物品名")] public string SupplierItemName { get; set; } /// diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/ISaleLabelService.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/ISaleLabelService.cs index fb69d9dc3..76245f942 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/ISaleLabelService.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/ISaleLabelService.cs @@ -31,7 +31,7 @@ public interface ISaleLabelService /// public Task UpdateFullBarcodeString(Guid id, string fullBarcodeString); /// - /// 根据id修改物品号 + /// 根据id修改ERP料号 /// /// /// diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/SaleLabelDto.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/SaleLabelDto.cs index ca7befcd4..fb7698acb 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/SaleLabelDto.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/SaleLabelDto.cs @@ -35,9 +35,9 @@ public class SaleLabelDto : SfsBasicDTOBase public string FullBarcodeString { get; set; } /// - /// 物品号 + /// ERP料号 /// - [Display(Name = "物品号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/SaleLabelEditInput.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/SaleLabelEditInput.cs index 6c9f8588e..29271f080 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/SaleLabelEditInput.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application.Contracts/SaleLabels/SaleLabelEditInput.cs @@ -14,9 +14,9 @@ public class SaleLabelEditInput : SfsLabelCreateOrUpdateInputBase public string FullBarcodeString { get; set; } /// - /// 物品号 + /// ERP料号 /// - [Display(Name = "物品号")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// 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 2d950e7c6..d5eb0339f 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 @@ -306,11 +306,11 @@ public class InventoryLabelAppService var item = await ItemBasicAppService.GetByCodeAsync(model.ItemCode).ConfigureAwait(false); if (item == null) { - validationRresult.Add(new ValidationResult($"物品代码{model.ItemCode}不存在", new string[] { "物品代码" })); + validationRresult.Add(new ValidationResult($"ERP料号{model.ItemCode}不存在", new string[] { "ERP料号" })); } else if (item.StdPackQty == 0) { - validationRresult.Add(new ValidationResult($"物品代码{model.ItemCode}的标准包装不存在", new string[] { "标准包装" })); + validationRresult.Add(new ValidationResult($"ERP料号{model.ItemCode}的标准包装不存在", new string[] { "标准包装" })); } // check suppiler if (!string.IsNullOrEmpty(model.SupplierCode)) @@ -327,7 +327,7 @@ public class InventoryLabelAppService var supplierItems = await _supplierItemAppService.GetListByItemCodeAsync(model.ItemCode).ConfigureAwait(false); if (supplierItems.All(p => p.SupplierItemCode != model.SupplierItemCode)) { - validationRresult.Add(new ValidationResult($"供应商物品代码{model.SupplierItemCode}不存在", new string[] { "供应商物品代码" })); + validationRresult.Add(new ValidationResult($"供应商ERP料号{model.SupplierItemCode}不存在", new string[] { "供应商ERP料号" })); } } } @@ -337,11 +337,11 @@ public class InventoryLabelAppService var item = await ItemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); if (item == null) { - validationRresult.Add("物品代码", $"物品代码{importInput.ItemCode}不存在"); + validationRresult.Add("ERP料号", $"ERP料号{importInput.ItemCode}不存在"); } else if (item.StdPackQty == 0) { - validationRresult.Add("标准包装", $"物品代码{importInput.ItemCode}的标准包装不存在"); + validationRresult.Add("标准包装", $"ERP料号{importInput.ItemCode}的标准包装不存在"); } } diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application/SaleLabels/SaleLabelService.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application/SaleLabels/SaleLabelService.cs index ac267e7b7..1d7365b00 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application/SaleLabels/SaleLabelService.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application/SaleLabels/SaleLabelService.cs @@ -73,7 +73,7 @@ public class SaleLabelService : SfsLabelAppServiceWithCodeBase - /// 根据id修改物品号 + /// 根据id修改ERP料号 /// /// /// diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Domain/InventoryLabels/InventoryLabel.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Domain/InventoryLabels/InventoryLabel.cs index 3fc352575..6dba02cc1 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Domain/InventoryLabels/InventoryLabel.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Domain/InventoryLabels/InventoryLabel.cs @@ -37,7 +37,7 @@ public class InventoryLabel : SfsAggregateRootBase public string FullBarcodeString { get; set; } /// - /// 物品号 + /// ERP料号 /// public string ItemCode { get; set; } @@ -156,15 +156,15 @@ public class InventoryLabel : SfsAggregateRootBase public string SupplierSimpleName { get; set; } /// - /// 供应商零件号 + /// 供应商ERP料号 /// - [Display(Name = "供应商零件号")] + [Display(Name = "供应商ERP料号")] public string SupplierItemCode { get; set; } /// - /// 供应商零件名 + /// 供应商物品名 /// - [Display(Name = "供应商零件名")] + [Display(Name = "供应商物品名")] public string SupplierItemName { get; set; } /// diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Domain/SaleLabels/SaleLabel.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Domain/SaleLabels/SaleLabel.cs index cc2711ee4..ad63d27e8 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Domain/SaleLabels/SaleLabel.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Domain/SaleLabels/SaleLabel.cs @@ -39,7 +39,7 @@ public class SaleLabel : SfsAggregateRootBase public string FullBarcodeString { get; set; } /// - /// 物品号 + /// ERP料号 /// [IgnoreUpdate] public string ItemCode { get; set; } diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/DataExchange/EnumL7PartsState.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/DataExchange/EnumL7PartsState.cs index 31f5768a9..26ff0b25b 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/DataExchange/EnumL7PartsState.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/DataExchange/EnumL7PartsState.cs @@ -1,7 +1,7 @@ namespace Win_in.Sfs.Shared.Domain.Shared; /// -/// 当前L7零件主配置的状态 +/// 当前L7物品主配置的状态 /// public enum EnumL7PartsState { diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumCountMethod.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumCountMethod.cs index eef4fd08e..b0271b426 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumCountMethod.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumCountMethod.cs @@ -26,8 +26,8 @@ public enum EnumCountMethod ByItem = 2, /// - /// 按库位按零件 + /// 按库位按物品 /// - [Display(Name = "按库位按零件")] + [Display(Name = "按库位按物品")] ByLocationAndItem = 3 } diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/Types/EnumReceiptType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/Types/EnumReceiptType.cs index 9a8fc96d9..e3505bade 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/Types/EnumReceiptType.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/Types/EnumReceiptType.cs @@ -26,7 +26,7 @@ public enum EnumReceiptType MesScanReceipt = 3, /// - /// L7级零件完工 + /// L7级物品完工 /// MesScanReceiptToL7Parts = 4, } diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Interfaces/IHasItem.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Interfaces/IHasItem.cs index 13bf0ba3d..4d110a379 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Interfaces/IHasItem.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Interfaces/IHasItem.cs @@ -3,7 +3,7 @@ namespace Win_in.Sfs.Shared.Domain; public interface IHasItem { /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobDetailDTOBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobDetailDTOBase.cs index 5124da79d..8afa1eef8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobDetailDTOBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobDetailDTOBase.cs @@ -33,9 +33,9 @@ public abstract class SfsJobDetailDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendDetailDTOBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendDetailDTOBase.cs index 4566cbd89..32228a9ae 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendDetailDTOBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendDetailDTOBase.cs @@ -31,9 +31,9 @@ public abstract class SfsJobRecommendDetailDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendFromDetailDTOBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendFromDetailDTOBase.cs index e2161239f..7c6566228 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendFromDetailDTOBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendFromDetailDTOBase.cs @@ -31,9 +31,9 @@ public abstract class SfsJobRecommendFromDetailDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendToDetailDTOBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendToDetailDTOBase.cs index 38738f490..0b97a2ed1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendToDetailDTOBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsJobRecommendToDetailDTOBase.cs @@ -31,9 +31,9 @@ public abstract class SfsJobRecommendToDetailDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsStoreDetailDTOBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsStoreDetailDTOBase.cs index 04662dcc1..208307096 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsStoreDetailDTOBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsStoreDetailDTOBase.cs @@ -9,9 +9,9 @@ public abstract class SfsStoreDetailDTOBase , IHasItem { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// /// 物品名称 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobDetailInputBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobDetailInputBase.cs index 26d668e15..bbb98ed75 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobDetailInputBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobDetailInputBase.cs @@ -34,9 +34,9 @@ public abstract class SfsJobDetailInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendDetailInputBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendDetailInputBase.cs index ba6f9dbea..3d5c85749 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendDetailInputBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendDetailInputBase.cs @@ -33,9 +33,9 @@ public abstract class SfsJobRecommendDetailInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendFromDetailInputBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendFromDetailInputBase.cs index c8548a78a..93615d13a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendFromDetailInputBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendFromDetailInputBase.cs @@ -33,9 +33,9 @@ public abstract class SfsJobRecommendFromDetailInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendToDetailInputBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendToDetailInputBase.cs index aeb4bc4ab..426744976 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendToDetailInputBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsJobRecommendToDetailInputBase.cs @@ -33,9 +33,9 @@ public abstract class SfsJobRecommendToDetailInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreDetailInputBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreDetailInputBase.cs index 5ce20d03c..01130e909 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreDetailInputBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreDetailInputBase.cs @@ -9,9 +9,9 @@ public abstract class SfsStoreDetailInputBase , IHasItem { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceSearchDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceSearchDTO.cs index 028366dc0..8d1ad8d33 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceSearchDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceSearchDTO.cs @@ -12,8 +12,8 @@ public class ChassisOperationSequenceSearchDTO public List ChassisNumberList { get; set; }=new List(); /// - /// Kitting组包Bom的物品号 + /// Kitting组包Bom的ERP料号 /// - [Display(Name = "Kitting组包Bom的物品号")] + [Display(Name = "Kitting组包Bom的ERP料号")] public string ItemCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/DTOs/EquipmentRecordDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/DTOs/EquipmentRecordDTO.cs index bba6be6c3..9f23f04a9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/DTOs/EquipmentRecordDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/DTOs/EquipmentRecordDTO.cs @@ -20,9 +20,9 @@ public class EquipmentRecordDTO : SfsBasicDTOBase [Display(Name = "条码编号")] public string BarCode { get; set; } /// - /// 零件号 + /// ERP料号 /// - [Display(Name = "零件号")] + [Display(Name = "ERP料号")] public string PartCode { get; set; } /// /// 批次 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/Inputs/EquipmentRecordEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/Inputs/EquipmentRecordEditInput.cs index de51993b0..6d482ba80 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/Inputs/EquipmentRecordEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/Inputs/EquipmentRecordEditInput.cs @@ -21,9 +21,9 @@ public class EquipmentRecordEditInput [Display(Name = "条码编号")] public string BarCode { get; set; } /// - /// 零件号 + /// ERP料号 /// - [Display(Name = "零件号")] + [Display(Name = "ERP料号")] public string PartCode { get; set; } /// /// 批次 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/Inputs/EquipmentRecordImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/Inputs/EquipmentRecordImportInput.cs index 82901aeda..f1088359b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/Inputs/EquipmentRecordImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/Inputs/EquipmentRecordImportInput.cs @@ -21,9 +21,9 @@ public class EquipmentRecordImportInput : SfsStoreImportInputBase [Display(Name = "条码编号")] public string BarCode { get; set; } /// - /// 零件号 + /// ERP料号 /// - [Display(Name = "零件号")] + [Display(Name = "ERP料号")] public string PartCode { get; set; } /// /// 批次 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CheckJobs/DTOs/CheckJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CheckJobs/DTOs/CheckJobDetailDTO.cs index 92e44e6ff..40aba06f5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CheckJobs/DTOs/CheckJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CheckJobs/DTOs/CheckJobDetailDTO.cs @@ -14,9 +14,9 @@ public class CheckJobDetailDTO : SfsJobDetailDTOBase, IHasQty public string Order { get; set; } /// - /// 客户物品号 + /// 客户ERP料号 /// - [Display(Name = "客户物品号")] + [Display(Name = "客户ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string CustomerItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CheckJobs/Inputs/CheckJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CheckJobs/Inputs/CheckJobDetailInput.cs index d69402041..9ffcb22ca 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CheckJobs/Inputs/CheckJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CheckJobs/Inputs/CheckJobDetailInput.cs @@ -14,9 +14,9 @@ public class CheckJobDetailInput : SfsJobDetailInputBase, IHasQty public string Order { get; set; } /// - /// 客户物品号 + /// 客户ERP料号 /// - [Display(Name = "客户物品号")] + [Display(Name = "客户ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string CustomerItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/DTOs/CountJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/DTOs/CountJobDTO.cs index 35aa9a5bb..7c80a5349 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/DTOs/CountJobDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/DTOs/CountJobDTO.cs @@ -55,9 +55,9 @@ public class CountJobDTO : SfsJobDTOBase public string Description { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobCreateRequestInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobCreateRequestInput.cs index 1699a4705..4633b7c03 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobCreateRequestInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobCreateRequestInput.cs @@ -30,9 +30,9 @@ public class CountJobCreateRequestInput public EnumCountType Type { get; set; } /// - /// 零件条件集合 + /// 物品条件集合 /// - [Display(Name = "零件条件集合")] + [Display(Name = "物品条件集合")] public List PartCondition { get; set; } = new(); /// @@ -76,9 +76,9 @@ public class CountJobCreateRequestInput public EnumCountStage CountStage { get; set; } = EnumCountStage.Circulate; /// - /// 盘点的零件集合 + /// 盘点的物品集合 /// - [Display(Name = "盘点的零件集合")] + [Display(Name = "盘点的物品集合")] public string JsonItemCodes { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobEditInput.cs index 2b0adf9d2..2fc1d80e6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobEditInput.cs @@ -40,9 +40,9 @@ public class CountJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput public string Description { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobImportInput.cs index 75b1e526a..f5e987b06 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobImportInput.cs @@ -14,9 +14,9 @@ public class CountJobImportInput : SfsStoreImportInputBase public string CountJobNumber { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/DTOs/InjectionPlanJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/DTOs/InjectionPlanJobDetailDTO.cs index 51b9dd71e..722ac3edf 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/DTOs/InjectionPlanJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/DTOs/InjectionPlanJobDetailDTO.cs @@ -12,7 +12,7 @@ public class InjectionPlanJobDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/Inputs/InjectionPlanJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/Inputs/InjectionPlanJobDetailInput.cs index 7bc81d81a..8daada228 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/Inputs/InjectionPlanJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InjectionPlanJobs/Inputs/InjectionPlanJobDetailInput.cs @@ -12,7 +12,7 @@ public class InjectionPlanJobDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/DTOs/InspectJobSummaryDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/DTOs/InspectJobSummaryDetailDTO.cs index e6fa0aa69..4ca359d26 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/DTOs/InspectJobSummaryDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/DTOs/InspectJobSummaryDetailDTO.cs @@ -124,9 +124,9 @@ public class InspectJobSummaryDetailDTO : SfsDetailDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/Inputs/InspectJobCompleteSummaryDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/Inputs/InspectJobCompleteSummaryDetailInput.cs index d3edd035a..00fb07f8f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/Inputs/InspectJobCompleteSummaryDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/Inputs/InspectJobCompleteSummaryDetailInput.cs @@ -131,9 +131,9 @@ public class InspectJobCompleteSummaryDetailInput : SfsDetailDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/Inputs/InspectJobSummaryDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/Inputs/InspectJobSummaryDetailInput.cs index 37d3d327d..ac56c584c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/Inputs/InspectJobSummaryDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/InspectJobs/Inputs/InspectJobSummaryDetailInput.cs @@ -112,9 +112,9 @@ public class InspectJobSummaryDetailInput : SfsDetailInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDetailDTO.cs index 0cd270e78..4e22066aa 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDetailDTO.cs @@ -11,7 +11,7 @@ public class AssembleIssueJobDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobDetailInput.cs index d642ca4b2..105543252 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobDetailInput.cs @@ -11,7 +11,7 @@ public class AssembleIssueJobDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/DTOs/CoatingIssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/DTOs/CoatingIssueJobDetailDTO.cs index 33d6b2b4d..d1001f84b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/DTOs/CoatingIssueJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/DTOs/CoatingIssueJobDetailDTO.cs @@ -11,7 +11,7 @@ public class CoatingIssueJobDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/Inputs/CoatingIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/Inputs/CoatingIssueJobDetailInput.cs index 2603292f7..447423204 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/Inputs/CoatingIssueJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/Inputs/CoatingIssueJobDetailInput.cs @@ -11,7 +11,7 @@ public class CoatingIssueJobDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs index b045edec5..8e17bb433 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs @@ -11,7 +11,7 @@ public class InjectionIssueJobDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobDetailInput.cs index ce12a5905..4aa7d190b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobDetailInput.cs @@ -11,7 +11,7 @@ public class InjectionIssueJobDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/DTOs/KittingIssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/DTOs/KittingIssueJobDetailDTO.cs index 53b40608a..50af43485 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/DTOs/KittingIssueJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/DTOs/KittingIssueJobDetailDTO.cs @@ -11,7 +11,7 @@ public class KittingIssueJobDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/Inputs/KittingIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/Inputs/KittingIssueJobDetailInput.cs index 61ae0694b..f2c52696d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/Inputs/KittingIssueJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/Inputs/KittingIssueJobDetailInput.cs @@ -11,7 +11,7 @@ public class KittingIssueJobDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/DTOs/SparePartIssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/DTOs/SparePartIssueJobDetailDTO.cs index 6ae3e19c2..03c12c478 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/DTOs/SparePartIssueJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/DTOs/SparePartIssueJobDetailDTO.cs @@ -11,7 +11,7 @@ public class SparePartIssueJobDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/Inputs/SparePartIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/Inputs/SparePartIssueJobDetailInput.cs index e10989964..c298bb652 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/Inputs/SparePartIssueJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/Inputs/SparePartIssueJobDetailInput.cs @@ -11,7 +11,7 @@ public class SparePartIssueJobDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ProductRecycleJobs/DTOs/ProductRecycleJobMaterialDetailDto.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ProductRecycleJobs/DTOs/ProductRecycleJobMaterialDetailDto.cs index 0e40333fd..37624f92c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ProductRecycleJobs/DTOs/ProductRecycleJobMaterialDetailDto.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ProductRecycleJobs/DTOs/ProductRecycleJobMaterialDetailDto.cs @@ -9,7 +9,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class ProductRecycleJobMaterialDetailDto : EntityDto { /// - /// 零件代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PutawayJobs/Inputs/PutawayInventoryInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PutawayJobs/Inputs/PutawayInventoryInput.cs index 101b2f7aa..77ab647d9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PutawayJobs/Inputs/PutawayInventoryInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PutawayJobs/Inputs/PutawayInventoryInput.cs @@ -15,9 +15,9 @@ public class PutawayInventoryInput public string PackingCode { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PutawayJobs/Inputs/PutawayJobCreateByPackingInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PutawayJobs/Inputs/PutawayJobCreateByPackingInput.cs index 761f5f78b..5b9ca074e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PutawayJobs/Inputs/PutawayJobCreateByPackingInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PutawayJobs/Inputs/PutawayJobCreateByPackingInput.cs @@ -15,9 +15,9 @@ public class PutawayJobCreateByPackingInput public string PackingCode { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/DTOs/TransferLibJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/DTOs/TransferLibJobDetailDTO.cs index b33f1be91..dad680a99 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/DTOs/TransferLibJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/DTOs/TransferLibJobDetailDTO.cs @@ -48,7 +48,7 @@ public class TransferLibJobDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } @@ -428,7 +428,7 @@ public class TransferLibJobDetailDTO : SfsDetailDTOBase public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobDetailInput.cs index fe8dc93f4..4573efef8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/Inputs/TransferLibJobDetailInput.cs @@ -48,7 +48,7 @@ public class TransferLibJobDetailInput : SfsStoreCreateOrUpdateInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } @@ -428,7 +428,7 @@ public class TransferLibJobDetailInput : SfsStoreCreateOrUpdateInputBase public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/DTOs/BackFlushNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/DTOs/BackFlushNoteDTO.cs index c19ef7c01..8c2307716 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/DTOs/BackFlushNoteDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/DTOs/BackFlushNoteDTO.cs @@ -50,9 +50,9 @@ public class BackFlushNoteDTO : SfsStoreDTOBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/Inputs/BackFlushNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/Inputs/BackFlushNoteEditInput.cs index af11880d9..de2535d7f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/Inputs/BackFlushNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/Inputs/BackFlushNoteEditInput.cs @@ -65,9 +65,9 @@ public class BackFlushNoteEditInput : SfsStoreCreateOrUpdateInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/Inputs/BackFlushNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/Inputs/BackFlushNoteImportInput.cs index 33013736b..a382c8cad 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/Inputs/BackFlushNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/BackFlusNotes/Inputs/BackFlushNoteImportInput.cs @@ -29,9 +29,9 @@ public class BackFlushNoteImportInput : SfsStoreImportInputBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CountNotes/Inputs/CountNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CountNotes/Inputs/CountNoteImportInput.cs index cf5f21635..67934ada1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CountNotes/Inputs/CountNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/CountNotes/Inputs/CountNoteImportInput.cs @@ -21,9 +21,9 @@ public class CountNoteImportInput : SfsStoreImportInputBase public string LocationCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/DTOs/InjectionPlanNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/DTOs/InjectionPlanNoteDetailDTO.cs index d6234eefd..312654e5e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/DTOs/InjectionPlanNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/DTOs/InjectionPlanNoteDetailDTO.cs @@ -12,7 +12,7 @@ public class InjectionPlanNoteDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/Inputs/InjectionPlanNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/Inputs/InjectionPlanNoteDetailInput.cs index dfa33a592..543811a15 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/Inputs/InjectionPlanNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InjectionPlanNotes/Inputs/InjectionPlanNoteDetailInput.cs @@ -12,7 +12,7 @@ public class InjectionPlanNoteDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs index a2e02a783..96f27424d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs @@ -19,9 +19,9 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty, public string PackingCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDetailDTO.cs index ca19aaab2..57e9404e6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDetailDTO.cs @@ -11,7 +11,7 @@ public class AssembleIssueNoteDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteDetailInput.cs index 145264c1f..568036110 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteDetailInput.cs @@ -11,7 +11,7 @@ public class AssembleIssueNoteDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/DTOs/CoatingIssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/DTOs/CoatingIssueNoteDetailDTO.cs index 6f8fb1d22..208667cd3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/DTOs/CoatingIssueNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/DTOs/CoatingIssueNoteDetailDTO.cs @@ -11,7 +11,7 @@ public class CoatingIssueNoteDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/Inputs/CoatingIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/Inputs/CoatingIssueNoteDetailInput.cs index 19689cf4e..8e9658f96 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/Inputs/CoatingIssueNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/Inputs/CoatingIssueNoteDetailInput.cs @@ -11,7 +11,7 @@ public class CoatingIssueNoteDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs index 7d9411de5..a95adf9ca 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs @@ -11,7 +11,7 @@ public class InjectionIssueNoteDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs index f05f28827..022951d0f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs @@ -11,7 +11,7 @@ public class InjectionIssueNoteDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/DTOs/KittingIssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/DTOs/KittingIssueNoteDetailDTO.cs index 77863aab5..cd22553d2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/DTOs/KittingIssueNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/DTOs/KittingIssueNoteDetailDTO.cs @@ -11,7 +11,7 @@ public class KittingIssueNoteDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/Inputs/KittingIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/Inputs/KittingIssueNoteDetailInput.cs index f72ba2435..7749169f6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/Inputs/KittingIssueNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/Inputs/KittingIssueNoteDetailInput.cs @@ -11,7 +11,7 @@ public class KittingIssueNoteDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/SparePartIssueNotes/DTOs/SparePartIssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/SparePartIssueNotes/DTOs/SparePartIssueNoteDetailDTO.cs index b2d7ffcb4..e933546ed 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/SparePartIssueNotes/DTOs/SparePartIssueNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/SparePartIssueNotes/DTOs/SparePartIssueNoteDetailDTO.cs @@ -11,7 +11,7 @@ public class SparePartIssueNoteDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/SparePartIssueNotes/Inputs/SparePartIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/SparePartIssueNotes/Inputs/SparePartIssueNoteDetailInput.cs index 82393b0b1..84232ccc5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/SparePartIssueNotes/Inputs/SparePartIssueNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/SparePartIssueNotes/Inputs/SparePartIssueNoteDetailInput.cs @@ -11,7 +11,7 @@ public class SparePartIssueNoteDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ItemTransformNotes/DTOs/ItemTransformNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ItemTransformNotes/DTOs/ItemTransformNoteDetailDTO.cs index 6357fe2fd..b78865ce3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ItemTransformNotes/DTOs/ItemTransformNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ItemTransformNotes/DTOs/ItemTransformNoteDetailDTO.cs @@ -22,9 +22,9 @@ public class ItemTransformNoteDetailDTO : SfsStoreDetailDTOBase public string ToPackingCode { get; set; } /// - /// 目标物品代码 + /// 目标ERP料号 /// - [Display(Name = "目标物品代码")] + [Display(Name = "目标ERP料号")] public string ToItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ItemTransformNotes/Inputs/ItemTransformNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ItemTransformNotes/Inputs/ItemTransformNoteDetailInput.cs index d284afaae..c8d66f325 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ItemTransformNotes/Inputs/ItemTransformNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ItemTransformNotes/Inputs/ItemTransformNoteDetailInput.cs @@ -21,9 +21,9 @@ public class ItemTransformNoteDetailInput : SfsStoreDetailInputBase public string ToPackingCode { get; set; } /// - /// 目标物品代码 + /// 目标ERP料号 /// - [Display(Name = "目标物品代码")] + [Display(Name = "目标ERP料号")] public string ToItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/KittingPackagingNotes/DTOs/KittingPackagingNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/KittingPackagingNotes/DTOs/KittingPackagingNoteDetailDTO.cs index 0ecdd679d..9b8b25603 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/KittingPackagingNotes/DTOs/KittingPackagingNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/KittingPackagingNotes/DTOs/KittingPackagingNoteDetailDTO.cs @@ -7,9 +7,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class KittingPackagingNoteDetailDTO : SfsStoreDetailDTOBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/KittingPackagingNotes/Inputs/KittingPackagingNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/KittingPackagingNotes/Inputs/KittingPackagingNoteDetailInput.cs index e4bacb627..181f7b555 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/KittingPackagingNotes/Inputs/KittingPackagingNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/KittingPackagingNotes/Inputs/KittingPackagingNoteDetailInput.cs @@ -7,9 +7,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class KittingPackagingNoteDetailInput : SfsStoreDetailInputBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleMaterialDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleMaterialDetailDTO.cs index fdb75622e..a10d57473 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleMaterialDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleMaterialDetailDTO.cs @@ -19,9 +19,9 @@ public class ProductRecycleMaterialDetailDTO : SfsStoreDetailWithLotPackingQtyLo public string ProductPackingCode { get; set; } /// - /// 产成品物料号 + /// 产成品ERP料号 /// - [Display(Name = "产成品物料号")] + [Display(Name = "产成品ERP料号")] public string ProductItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleNoteDetailDTO.cs index ebcb9e2f1..fa4806223 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleNoteDetailDTO.cs @@ -23,9 +23,9 @@ public class ProductRecycleNoteDetailDTO : SfsStoreDetailWithLotPackingQtyLocati public class ProductRecycleNoteAndBackFlushDetailDTO { /// - /// 退拆物料号 + /// 退拆ERP料号 /// - [Display(Name = "退拆物料号")] + [Display(Name = "退拆ERP料号")] public string ItemCode { get; set; } /// @@ -65,9 +65,9 @@ public class ProductRecycleNoteAndBackFlushDetailDTO public int WorkHour { get; set; } /// - /// 转移物料号 + /// 转移ERP料号 /// - [Display(Name = "转移物料号")] + [Display(Name = "转移ERP料号")] public string RawItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleNoteDetailExtendDto.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleNoteDetailExtendDto.cs index dccc68a82..2968bdff2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleNoteDetailExtendDto.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/DTOs/ProductRecycleNoteDetailExtendDto.cs @@ -12,7 +12,7 @@ public class ProductRecycleNoteDetailExtendDto [Display(Name ="报废类型")] public string Type { get; set; } - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } [Display(Name = "报废库位")] diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/Inputs/ProductRecycleMaterialDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/Inputs/ProductRecycleMaterialDetailInput.cs index ada5043e3..724ba9d8e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/Inputs/ProductRecycleMaterialDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ProductRecycleNotes/Inputs/ProductRecycleMaterialDetailInput.cs @@ -17,9 +17,9 @@ public class ProductRecycleMaterialDetailInput : SfsStoreDetailWithLotPackingQty public string ProductPackingCode { get; set; } /// - /// 产成品物料号 + /// 产成品ERP料号 /// - [Display(Name = "产成品物料号")] + [Display(Name = "产成品ERP料号")] public string ProductItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/DTOs/TransferLibNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/DTOs/TransferLibNoteDetailDTO.cs index 3296b5995..2b2f6013a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/DTOs/TransferLibNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/DTOs/TransferLibNoteDetailDTO.cs @@ -48,7 +48,7 @@ public class TransferLibNoteDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } @@ -428,7 +428,7 @@ public class TransferLibNoteDetailDTO : SfsDetailDTOBase public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteDetailInput.cs index 4b16c3ae9..c444d8141 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteDetailInput.cs @@ -48,7 +48,7 @@ public class TransferLibNoteDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } @@ -428,7 +428,7 @@ public class TransferLibNoteDetailInput : SfsDetailInputBase public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteImportInput.cs index 3e3b88ed9..9272f5fc2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferLibNotes/Inputs/TransferLibNoteImportInput.cs @@ -43,9 +43,9 @@ public class TransferLibNoteImportInput : SfsStoreImportInputBase public bool Confirmed { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/Inputs/TransferNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/Inputs/TransferNoteImportInput.cs index de6b8186e..6ac4a6bcf 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/Inputs/TransferNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/TransferNotes/Inputs/TransferNoteImportInput.cs @@ -41,9 +41,9 @@ public class TransferNoteImportInput : SfsStoreImportInputBase public bool Confirmed { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/WipWarehouseAdjustNotes/Inputs/WipWarehouseAdjustNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/WipWarehouseAdjustNotes/Inputs/WipWarehouseAdjustNoteImportInput.cs index 05ab88ea6..131e256f3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/WipWarehouseAdjustNotes/Inputs/WipWarehouseAdjustNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/WipWarehouseAdjustNotes/Inputs/WipWarehouseAdjustNoteImportInput.cs @@ -27,9 +27,9 @@ public class WipWarehouseAdjustNoteImportInput : SfsStoreImportInputBase public bool Confirmed { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderDetailUpdateInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderDetailUpdateInput.cs index b1e423f80..92a33bbf1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderDetailUpdateInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderDetailUpdateInput.cs @@ -13,9 +13,9 @@ public class PurchaseOrderDetailUpdateInput : EntityDto public string PoLine { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderImportInput.cs index a0a9ec797..cd257536c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderImportInput.cs @@ -96,9 +96,9 @@ public class PurchaseOrderImportInput : SfsStoreImportInputBase public string PoLine { get; set; } /// - /// 明细-物品代码 + /// 明细-ERP料号 /// - [Display(Name = "明细-物品代码")] + [Display(Name = "明细-ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/SaleOrders/Inputs/SaleOrderImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/SaleOrders/Inputs/SaleOrderImportInput.cs index 5d857182a..1e5e9d10b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/SaleOrders/Inputs/SaleOrderImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/SaleOrders/Inputs/SaleOrderImportInput.cs @@ -87,9 +87,9 @@ public class SaleOrderImportInput : SfsStoreImportInputBase [Display(Name = "明细-订单行")] public string SoLine { get; set; } /// - /// 明细-物品代码 + /// 明细-ERP料号 /// - [Display(Name = "明细-物品代码")] + [Display(Name = "明细-ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/DTOs/WorkOrderDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/DTOs/WorkOrderDTO.cs index 4a250da0f..0a1c16fc6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/DTOs/WorkOrderDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/DTOs/WorkOrderDTO.cs @@ -82,9 +82,9 @@ public class WorkOrderDTO : SfsStoreDTOBase public string ItemDesc2 { get; set; } /// - /// 父物品代码 + /// 父ERP料号 /// - [Display(Name = "父物品代码")] + [Display(Name = "父ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/Inputs/WorkOrderEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/Inputs/WorkOrderEditInput.cs index ca7422a4f..d71980084 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/Inputs/WorkOrderEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/Inputs/WorkOrderEditInput.cs @@ -76,9 +76,9 @@ public class WorkOrderEditInput : SfsStoreCreateOrUpdateInputBase public string ItemDesc2 { get; set; } /// - /// 父物品代码 + /// 父ERP料号 /// - [Display(Name = "父物品代码")] + [Display(Name = "父ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/Inputs/WorkOrderImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/Inputs/WorkOrderImportInput.cs index b150f5156..463bdb24e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/Inputs/WorkOrderImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/WorkOrders/Inputs/WorkOrderImportInput.cs @@ -76,9 +76,9 @@ public class WorkOrderImportInput : SfsStoreImportInputBase public string ItemDesc2 { get; set; } /// - /// 父物品代码 + /// 父ERP料号 /// - [Display(Name = "父物品代码")] + [Display(Name = "父ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanDTO.cs index 9e398755b..c571faccb 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanDTO.cs @@ -71,9 +71,9 @@ public class CountPlanDTO : SfsStoreRequestDTOBase public EnumInventoryMode InventoryMode { get; set; } /// - /// 盘点的零件集合 + /// 盘点的物品集合 /// - [Display(Name = "盘点的零件集合")] + [Display(Name = "盘点的物品集合")] public string JsonItemCodes { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanForNoteExportDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanForNoteExportDTO.cs index 5299f9435..038ad8b26 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanForNoteExportDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanForNoteExportDTO.cs @@ -24,9 +24,9 @@ public class CountPlanForNoteExportDTO public string LocationCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanCreateRequestInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanCreateRequestInput.cs index a681599cd..7e0c4e498 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanCreateRequestInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanCreateRequestInput.cs @@ -61,9 +61,9 @@ public class CountPlanCreateRequestInput : SfsStoreRequestCreateOrUpdateInputBas public EnumInventoryMode InventoryMode { get; set; } /// - /// 零件条件集合 + /// 物品条件集合 /// - [Display(Name = "零件条件集合")] + [Display(Name = "物品条件集合")] public Condition PartCondition { get; set; } = new(); /// @@ -85,9 +85,9 @@ public class CountPlanCreateRequestInput : SfsStoreRequestCreateOrUpdateInputBas public List StatusList { get; set; } /// - /// 盘点的零件集合 + /// 盘点的物品集合 /// - [Display(Name = "盘点的零件集合")] + [Display(Name = "盘点的物品集合")] public string JsonItemCodes { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanEditInput.cs index 7b809e0dc..cd9568ef2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanEditInput.cs @@ -78,9 +78,9 @@ public class CountPlanEditInput : SfsStoreRequestCreateOrUpdateInputBase, IHasNu /// - /// 盘点的零件集合 + /// 盘点的物品集合 /// - [Display(Name = "盘点的零件集合")] + [Display(Name = "盘点的物品集合")] public string JsonItemCodes { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/InjectioModelPlans/Inputs/InjectioModelPlanImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/InjectioModelPlans/Inputs/InjectioModelPlanImportInput.cs index bfb948499..fad968254 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/InjectioModelPlans/Inputs/InjectioModelPlanImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/InjectioModelPlans/Inputs/InjectioModelPlanImportInput.cs @@ -68,9 +68,9 @@ public class InjectioModelPlanImportInput : SfsStoreImportInputBase //public string WarehouseCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "明细-物品代码")] + [Display(Name = "明细-ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/PreparationPlans/Inputs/PreparationPlanImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/PreparationPlans/Inputs/PreparationPlanImportInput.cs index d3375f518..6610cafa2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/PreparationPlans/Inputs/PreparationPlanImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/PreparationPlans/Inputs/PreparationPlanImportInput.cs @@ -69,9 +69,9 @@ public class PreparationPlanImportInput : SfsStoreImportInputBase public string WarehouseCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "明细-物品代码")] + [Display(Name = "明细-ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/ProductionPlans/Inputs/ProductionPlanImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/ProductionPlans/Inputs/ProductionPlanImportInput.cs index 741d06356..318d3ff43 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/ProductionPlans/Inputs/ProductionPlanImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/ProductionPlans/Inputs/ProductionPlanImportInput.cs @@ -68,9 +68,9 @@ public class ProductionPlanImportInput : SfsStoreImportInputBase public string WarehouseCode { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "明细-物品代码")] + [Display(Name = "明细-ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/DTOs/DYSupplierAsnExportDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/DTOs/DYSupplierAsnExportDTO.cs index c82342485..aab8a1361 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/DTOs/DYSupplierAsnExportDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/DTOs/DYSupplierAsnExportDTO.cs @@ -56,9 +56,9 @@ public class DySupplierAsnExportDTO : SfsStoreImportInputBase public string ProjectCode { get; set; } /// - /// 明细-物料代码 + /// 明细-ERP料号 /// - [Display(Name = "明细-物料代码")] + [Display(Name = "明细-ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/Inputs/SupplierAsnImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/Inputs/SupplierAsnImportInput.cs index 397c04a40..79f83dc03 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/Inputs/SupplierAsnImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/Inputs/SupplierAsnImportInput.cs @@ -65,9 +65,9 @@ public class SupplierAsnImportInput : SfsStoreImportInputBase public string ProjectCode { get; set; } /// - /// 明细-物料代码 + /// 明细-ERP料号 /// - [Display(Name = "明细-物料代码")] + [Display(Name = "明细-ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/CountAdjustRequests/Inputs/CountAdjustRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/CountAdjustRequests/Inputs/CountAdjustRequestImportInput.cs index d0c23bea9..9ca5022d7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/CountAdjustRequests/Inputs/CountAdjustRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/CountAdjustRequests/Inputs/CountAdjustRequestImportInput.cs @@ -6,10 +6,10 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class CountAdjustRequestImportInput : SfsStoreImportInputBase { /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] - [Required(ErrorMessage = "物料号不能为空")] + [Display(Name = "ERP料号")] + [Required(ErrorMessage = "ERP料号不能为空")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs index f70191045..1d48f2443 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs @@ -21,9 +21,9 @@ public class DeliverRequestImportInput : SfsStoreImportInputBase public string CustomerCode { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } @@ -76,9 +76,9 @@ public class DeliverRequestFisImportInput : SfsStoreImportInputBase public string CustomerCode { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/Inputs/InjectionPlanRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/Inputs/InjectionPlanRequestImportInput.cs index 05658c92b..253d5a92f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/Inputs/InjectionPlanRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/InjectionPlanRequests/Inputs/InjectionPlanRequestImportInput.cs @@ -13,9 +13,9 @@ public class InjectionPlanRequestImportInput : SfsStoreImportInputBase public EnumIssueRequestType IssueRequestType { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs index ae16fb995..9d1399196 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/Inputs/AssembleIssueRequestImportInput.cs @@ -12,9 +12,9 @@ public class AssembleIssueRequestImportInput : SfsStoreImportInputBase #region 目标库位信息 /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/Inputs/CoatingIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/Inputs/CoatingIssueRequestImportInput.cs index bd527e15c..90946b400 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/Inputs/CoatingIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/Inputs/CoatingIssueRequestImportInput.cs @@ -12,9 +12,9 @@ public class CoatingIssueRequestImportInput : SfsStoreImportInputBase #region 目标库位信息 /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs index 4a205e217..baaeeab47 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs @@ -12,9 +12,9 @@ public class InjectionIssueRequestImportInput : SfsStoreImportInputBase #region 目标库位信息 /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/Inputs/KittingIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/Inputs/KittingIssueRequestImportInput.cs index fac195b93..7cdff65d9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/Inputs/KittingIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/Inputs/KittingIssueRequestImportInput.cs @@ -11,9 +11,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class KittingIssueRequestImportInput : SfsStoreImportInputBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/MaterialRequests/Inputs/MaterialRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/MaterialRequests/Inputs/MaterialRequestImportInput.cs index 5d9e57d59..92a768059 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/MaterialRequests/Inputs/MaterialRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/MaterialRequests/Inputs/MaterialRequestImportInput.cs @@ -18,9 +18,9 @@ public class MaterialRequestImportInput : SfsStoreImportInputBase public string Type { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs index cc98760a6..6c362dae4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs @@ -10,9 +10,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class SparePartIssueRequestImportInput : SfsStoreImportInputBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/DTOs/ItemTransformRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/DTOs/ItemTransformRequestDetailDTO.cs index 46d7011f7..70a0e9b2d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/DTOs/ItemTransformRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/DTOs/ItemTransformRequestDetailDTO.cs @@ -22,9 +22,9 @@ public class ItemTransformRequestDetailDTO : SfsStoreDetailDTOBase public string ToPackingCode { get; set; } /// - /// 目标物品代码 + /// 目标ERP料号 /// - [Display(Name = "目标物品代码")] + [Display(Name = "目标ERP料号")] public string ToItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/Inputs/ItemTransformRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/Inputs/ItemTransformRequestDetailInput.cs index 48088b09c..abba91b09 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/Inputs/ItemTransformRequestDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/Inputs/ItemTransformRequestDetailInput.cs @@ -21,9 +21,9 @@ public class ItemTransformRequestDetailInput : SfsStoreDetailInputBase public string ToPackingCode { get; set; } /// - /// 目标物品代码 + /// 目标ERP料号 /// - [Display(Name = "目标物品代码")] + [Display(Name = "目标ERP料号")] public string ToItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/Inputs/ItemTransformRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/Inputs/ItemTransformRequestImportInput.cs index f82e619a8..245809a17 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/Inputs/ItemTransformRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ItemTransformRequests/Inputs/ItemTransformRequestImportInput.cs @@ -40,16 +40,16 @@ public class ItemTransformRequestImportInput : SfsStoreImportInputBase public string ToPackingCode { get; set; } /// - /// 来源物品代码 + /// 来源ERP料号 /// - [Display(Name = "来源物品代码")] + [Display(Name = "来源ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string FromItemCode { get; set; } /// - /// 目标物品代码 + /// 目标ERP料号 /// - [Display(Name = "目标物品代码")] + [Display(Name = "目标ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ToItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductReceiptRequests/Inputs/ProductReceiptRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductReceiptRequests/Inputs/ProductReceiptRequestImportInput.cs index 6bf698f6c..6efdecee3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductReceiptRequests/Inputs/ProductReceiptRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductReceiptRequests/Inputs/ProductReceiptRequestImportInput.cs @@ -21,9 +21,9 @@ public class ProductReceiptRequestImportInput : SfsStoreImportInputBase public string RawArea { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductRecycleRequests/Inputs/ProductRecycleRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductRecycleRequests/Inputs/ProductRecycleRequestImportInput.cs index ab7825ae3..73abd3f18 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductRecycleRequests/Inputs/ProductRecycleRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductRecycleRequests/Inputs/ProductRecycleRequestImportInput.cs @@ -13,9 +13,9 @@ public class ProductRecycleRequestImportInput : SfsStoreImportInputBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductionReturnRequests/Inputs/ProductionReturnRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductionReturnRequests/Inputs/ProductionReturnRequestImportInput.cs index 9be1f1481..503198f1e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductionReturnRequests/Inputs/ProductionReturnRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductionReturnRequests/Inputs/ProductionReturnRequestImportInput.cs @@ -7,9 +7,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class ProductionReturnRequestImportInput : SfsStoreImportInputBase { /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/Inputs/PurchaseReceiptRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/Inputs/PurchaseReceiptRequestImportInput.cs index 5c329e80c..76b572eb9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/Inputs/PurchaseReceiptRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/Inputs/PurchaseReceiptRequestImportInput.cs @@ -124,9 +124,9 @@ public class PurchaseReceiptRequestImportInput : SfsStoreImportInputBase, IHasPo [Display(Name = "明细-物品描述2")] public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "明细-物品代码")] + [Display(Name = "明细-ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReturnRequests/Inputs/PurchaseReturnRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReturnRequests/Inputs/PurchaseReturnRequestImportInput.cs index d31d94de2..aaa7925e7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReturnRequests/Inputs/PurchaseReturnRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReturnRequests/Inputs/PurchaseReturnRequestImportInput.cs @@ -47,9 +47,9 @@ public class PurchaseReturnRequestImportInput public string PoLine { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ScrapRequests/Inputs/ScrapRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ScrapRequests/Inputs/ScrapRequestImportInput.cs index 85191a64c..3c6af9b48 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ScrapRequests/Inputs/ScrapRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ScrapRequests/Inputs/ScrapRequestImportInput.cs @@ -21,9 +21,9 @@ public class ScrapRequestImportInput : SfsStoreImportInputBase public string Type { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ThirdLocationRequests/Inputs/ThirdLocationRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ThirdLocationRequests/Inputs/ThirdLocationRequestImportInput.cs index 42f12ab08..dc73dd928 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ThirdLocationRequests/Inputs/ThirdLocationRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ThirdLocationRequests/Inputs/ThirdLocationRequestImportInput.cs @@ -15,9 +15,9 @@ public class ThirdLocationRequestImportInput : SfsStoreImportInputBase public string Type { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] [Required] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/DTOs/TransferLibRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/DTOs/TransferLibRequestDetailDTO.cs index 18fc0fea2..ac1f2f6d2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/DTOs/TransferLibRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/DTOs/TransferLibRequestDetailDTO.cs @@ -53,7 +53,7 @@ public class TransferLibRequestDetailDTO : SfsDetailDTOBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } @@ -433,7 +433,7 @@ public class TransferLibRequestDetailDTO : SfsDetailDTOBase public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/Inputs/TransferLibRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/Inputs/TransferLibRequestDetailInput.cs index ddbf2cc21..03de0a265 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/Inputs/TransferLibRequestDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/Inputs/TransferLibRequestDetailInput.cs @@ -54,7 +54,7 @@ public class TransferLibRequestDetailInput : SfsDetailInputBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } @@ -296,7 +296,7 @@ public class TransferLibRequestDetailInput : SfsDetailInputBase public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/Inputs/TransferLibRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/Inputs/TransferLibRequestImportInput.cs index d58c187c3..ebf194a6d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/Inputs/TransferLibRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/Inputs/TransferLibRequestImportInput.cs @@ -33,9 +33,9 @@ public class TransferLibRequestImportInput : SfsStoreImportInputBase public string OnTheWayLocationCode { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs index 1246dbefd..6a9be79c9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs @@ -35,9 +35,9 @@ public class TransferRequestImportInput : SfsStoreImportInputBase public string OnTheWayLocationCode { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs index df1b9969c..e7fc3e6c5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs @@ -14,10 +14,10 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase public EnumUnplannedIssueType UnplannedIssueType { get; set; } /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物料号")] - [Required(ErrorMessage = "物料号不能为空")] + [Display(Name = "ERP料号")] + [Required(ErrorMessage = "ERP料号不能为空")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs index 626a82b11..2f891a42c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs @@ -14,10 +14,10 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } /// - /// 物料号 + /// ERP料号 /// - [Display(Name = "物料号")] - [Required(ErrorMessage = "物料号不能为空")] + [Display(Name = "ERP料号")] + [Required(ErrorMessage = "ERP料号不能为空")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/WipWarehouseAdjustRequests/Inputs/WipWarehouseAdjustRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/WipWarehouseAdjustRequests/Inputs/WipWarehouseAdjustRequestImportInput.cs index 45f94ece8..82ff57d2b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/WipWarehouseAdjustRequests/Inputs/WipWarehouseAdjustRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/WipWarehouseAdjustRequests/Inputs/WipWarehouseAdjustRequestImportInput.cs @@ -20,7 +20,7 @@ public class WipWarehouseAdjustRequestImportInput : SfsStoreImportInputBase /// /// 物品编号 /// - [Display(Name = "物料号")] + [Display(Name = "ERP料号")] [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Win_in.Sfs.Wms.Store.Application.Contracts.xml b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Win_in.Sfs.Wms.Store.Application.Contracts.xml index 5e514342a..d02a3d291 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Win_in.Sfs.Wms.Store.Application.Contracts.xml +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Win_in.Sfs.Wms.Store.Application.Contracts.xml @@ -86,7 +86,7 @@ - 物品代码 + ERP料号 @@ -333,7 +333,7 @@ - 物品代码 + ERP料号 @@ -398,7 +398,7 @@ - 物品代码 + ERP料号 @@ -498,7 +498,7 @@ - 物品代码 + ERP料号 @@ -643,7 +643,7 @@ - 物品代码 + ERP料号 @@ -738,7 +738,7 @@ - 物品代码 + ERP料号 @@ -893,7 +893,7 @@ - 物品代码 + ERP料号 @@ -968,7 +968,7 @@ - 物品代码 + ERP料号 @@ -1318,7 +1318,7 @@ - 物品代码 + ERP料号 @@ -1668,7 +1668,7 @@ - 物品代码 + ERP料号 @@ -1918,7 +1918,7 @@ - 物品代码 + ERP料号 @@ -2258,7 +2258,7 @@ - 物品代码 + ERP料号 @@ -2723,7 +2723,7 @@ - 物品代码 + ERP料号 @@ -2941,7 +2941,7 @@ - 零件条件集合 + 物品条件集合 @@ -3221,7 +3221,7 @@ - 物品代码 + ERP料号 @@ -3501,7 +3501,7 @@ - 物料代码 + ERP料号 @@ -3891,7 +3891,7 @@ - 物品代码 + ERP料号 @@ -4171,7 +4171,7 @@ - 物料代码 + ERP料号 @@ -4441,7 +4441,7 @@ - 物品代码 + ERP料号 @@ -4716,7 +4716,7 @@ - 物品代码 + ERP料号 @@ -5273,7 +5273,7 @@ - 物品代码 + ERP料号 @@ -5835,7 +5835,7 @@ - 物品代码 + ERP料号 @@ -6015,7 +6015,7 @@ - 物品代码 + ERP料号 @@ -6135,7 +6135,7 @@ - 物品代码 + ERP料号 @@ -6380,7 +6380,7 @@ - 目标物品代码 + 目标ERP料号 @@ -6520,7 +6520,7 @@ - 来源物品代码 + 来源ERP料号 @@ -6545,7 +6545,7 @@ - 目标物品代码 + 目标ERP料号 @@ -6735,7 +6735,7 @@ - 目标物品代码 + 目标ERP料号 @@ -6895,7 +6895,7 @@ - 目标物品代码 + 目标ERP料号 @@ -7040,7 +7040,7 @@ - 来源物品代码 + 来源ERP料号 @@ -7065,7 +7065,7 @@ - 目标物品代码 + 目标ERP料号 @@ -7230,7 +7230,7 @@ - 目标物品代码 + 目标ERP料号 @@ -7370,12 +7370,12 @@ - 来源物品代码 + 来源ERP料号 - 目标物品代码 + 目标ERP料号 @@ -7470,7 +7470,7 @@ - 物品代码 + ERP料号 @@ -7940,7 +7940,7 @@ - 物品代码 + ERP料号 @@ -8360,7 +8360,7 @@ - 物品代码 + ERP料号 @@ -8541,7 +8541,7 @@ - 物品代码 + ERP料号 @@ -8698,7 +8698,7 @@ - 物品代码 + ERP料号 @@ -8838,7 +8838,7 @@ - 物品代码 + ERP料号 @@ -9018,7 +9018,7 @@ - 物品代码 + ERP料号 @@ -9123,7 +9123,7 @@ - 物品代码 + ERP料号 @@ -9333,7 +9333,7 @@ - 物品代码 + ERP料号 @@ -9425,7 +9425,7 @@ - 物品代码 + ERP料号 @@ -9710,7 +9710,7 @@ - 物料号 + ERP料号 @@ -10237,7 +10237,7 @@ - 物品代码 + ERP料号 @@ -10522,7 +10522,7 @@ - 物品代码 + ERP料号 @@ -10792,7 +10792,7 @@ - 退拆物料号 + 退拆ERP料号 @@ -10827,7 +10827,7 @@ - 转移物料号 + 转移ERP料号 @@ -10842,7 +10842,7 @@ - 物品代码 + ERP料号 @@ -10997,7 +10997,7 @@ - 退拆物料号 + 退拆ERP料号 @@ -11032,7 +11032,7 @@ - 转移物料号 + 转移ERP料号 @@ -11197,7 +11197,7 @@ - 物品代码 + ERP料号 @@ -11387,7 +11387,7 @@ - 物品代码 + ERP料号 @@ -11567,7 +11567,7 @@ - 物品代码 + ERP料号 @@ -11787,7 +11787,7 @@ - 明细-物品代码 + 明细-ERP料号 @@ -11966,7 +11966,7 @@ - 物品代码 + ERP料号 @@ -12400,7 +12400,7 @@ - 物品代码 + ERP料号 @@ -12852,7 +12852,7 @@ - 物品代码 + ERP料号 @@ -13537,7 +13537,7 @@ - 物品代码 + ERP料号 @@ -14337,7 +14337,7 @@ - 物品代码 + ERP料号 @@ -14487,7 +14487,7 @@ - 物品代码 + ERP料号 @@ -14577,7 +14577,7 @@ - 物品代码 + ERP料号 @@ -14772,7 +14772,7 @@ - 明细-物品代码 + 明细-ERP料号 @@ -14884,7 +14884,7 @@ - 物品代码 + ERP料号 @@ -15184,7 +15184,7 @@ - 物品代码 + ERP料号 @@ -15489,7 +15489,7 @@ - 物品代码 + ERP料号 @@ -15634,7 +15634,7 @@ - 物品代码 + ERP料号 @@ -15844,7 +15844,7 @@ - 物料号 + ERP料号 @@ -15936,7 +15936,7 @@ - 物品代码 + ERP料号 @@ -16071,7 +16071,7 @@ - 物料号 + ERP料号 @@ -16321,7 +16321,7 @@ - 物品代码 + ERP料号 @@ -16571,7 +16571,7 @@ - 物品代码 + ERP料号 @@ -16761,7 +16761,7 @@ - 物品代码 + ERP料号 @@ -16846,7 +16846,7 @@ - 父物品代码 + 父ERP料号 @@ -16891,7 +16891,7 @@ - 父物品代码 + 父ERP料号 @@ -17006,7 +17006,7 @@ - 父物品代码 + 父ERP料号 @@ -17087,7 +17087,7 @@ - 父物品代码 + 父ERP料号 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs index b96b8f1fb..45bb21bff 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs @@ -178,12 +178,12 @@ public class CountJobAppService var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); if (item == null) { - validationRresult.Add(new ValidationResult($"物品代码{importInput.ItemCode}不存在", new[] { "物品代码" })); + validationRresult.Add(new ValidationResult($"ERP料号{importInput.ItemCode}不存在", new[] { "ERP料号" })); } else if (item.StdPackQty == 0) { validationRresult.Add( - new ValidationResult($"物品代码{importInput.ItemCode}的物品信息中标准包装等于0或不存在", new[] { "标准包装" })); + new ValidationResult($"ERP料号{importInput.ItemCode}的物品信息中标准包装等于0或不存在", new[] { "标准包装" })); } else { @@ -201,7 +201,7 @@ public class CountJobAppService var item = await _itemStoreRelationAppService.GetByItemAndLocationAsync(importInput.ItemCode,locationCode,EnumStoreRelationType.Location).ConfigureAwait(false); if (item == null) { - validationRresult.Add(new ValidationResult($"零件与库位{locationCode}对应关系不存在", new[] { "物品代码" })); + validationRresult.Add(new ValidationResult($"物品与库位{locationCode}对应关系不存在", new[] { "ERP料号" })); } return item; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/ProxyIssueJobDto.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/ProxyIssueJobDto.cs index e60ffe8ba..c582c7d77 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/ProxyIssueJobDto.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/proxy/ProxyIssueJobDto.cs @@ -19,7 +19,7 @@ public class IssueRequestFromRestoDTO /// public class IssueJobFromRestoDetailDTO { - [Display(Name = "零件编号")] + [Display(Name = "物品编号")] public string ItemCode { set; get; } [Display(Name = "目标库位")] public string ToLocationCode { set; get; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs index 6fd68de17..dcca388a1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs @@ -58,9 +58,9 @@ public class BackFlushNoteAppService : { if (backFlushNotes != null && backFlushNotes.Count > 0) { - // 主零件号 + // 主ERP料号 var itemCodes = backFlushNotes.Select(t => t.ItemCode); - // 从零件号 + // 从ERP料号 var detailsItemCodes = backFlushNotes.SelectMany(t => t.Details).Select(t => t.ItemCode); itemCodes = itemCodes.Concat(detailsItemCodes).Distinct(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs index e14b1c846..03aad37cd 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs @@ -117,7 +117,7 @@ public class CountNoteAppService : { if (itemcBasicDto == null) { - throw new UserFriendlyException($"物品代码为【{detail.ItemCode}】不存在"); + throw new UserFriendlyException($"ERP料号为【{detail.ItemCode}】不存在"); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs index b4850d5fd..61968abcd 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs @@ -69,7 +69,7 @@ public class CustomerProductionReturnNoteAppService : var partErr = checkPart.Select(x => x.ItemCode).Distinct().ToList(); if (partErr.Count > 0) { - throw new UserFriendlyException($"客户零件{string.Join(",",partErr)}不在零件关系表中，不能退货！"); + throw new UserFriendlyException($"客户物品{string.Join(",",partErr)}不在物品关系表中，不能退货！"); } var checkCustomer= from itm in entity.Details.ToList() join itm1 in custitmDetail @@ -79,7 +79,7 @@ public class CustomerProductionReturnNoteAppService : var custErr= checkCustomer.Select(x => x.CustomerCode).Distinct().ToList(); if (custErr.Count > 1) { - throw new UserFriendlyException($"提交客户退货零件{string.Join(",", custErr)}存在多个客户，不能退货！"); + throw new UserFriendlyException($"提交客户退货物品{string.Join(",", custErr)}存在多个客户，不能退货！"); } if(entity.Details.Count>0) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs index a8bca2378..bdc8d97bf 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs @@ -96,7 +96,7 @@ public class InventoryInitialNoteAppService : var item = await ItemBasicAclService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); if (item == null) { - validationRresult.Add("物品代码", $"物品代码{importInput.ItemCode}不存在"); + validationRresult.Add("ERP料号", $"ERP料号{importInput.ItemCode}不存在"); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs index f8fb2d4d4..c2dec06a4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs @@ -59,7 +59,7 @@ public class KittingPackagingNoteAppService input.Details = new EditableList(); await _chassisOperationSequenceAppService.UpdateChassisSortNumberByKittingCodeAsync(input.KittingCode,sortNumber, maxChassisDetailInputs.ChassisNumber).ConfigureAwait(false); - //所有底盘转换为总成的零件号 + //所有底盘转换为总成的ERP料号 var chassisItemCode = new List(); var listItemCode=input.DepDetails.Select(p => p.ItemCode); foreach (var itemCode in listItemCode) @@ -67,17 +67,17 @@ public class KittingPackagingNoteAppService var bomDtos=await _bomAppService.GetBomTreeByCodeAsync(itemCode).ConfigureAwait(false); if (bomDtos == null|| bomDtos.Count<1) { - throw new UserFriendlyException($"物品代码【{itemCode}】没有Bom信息"); + throw new UserFriendlyException($"ERP料号【{itemCode}】没有Bom信息"); } var bomItemCodeList = bomDtos.Select(p => p.Component); chassisItemCode.AddRange(bomItemCodeList); } chassisItemCode=chassisItemCode.Distinct().ToList(); - //获取kitting中维护的零件号 + //获取kitting中维护的ERP料号 var kittingDto=await _kittingAppService.GetByCodeAsync(input.KittingCode).ConfigureAwait(false); var kittingItemCodeList= kittingDto.Details.Select(p => p.ItemCode); - //取出交集得到KittingCode中的零件 + //取出交集得到KittingCode中的物品 var hasItemCode= kittingItemCodeList.Intersect(chassisItemCode).ToList(); if (hasItemCode == null || hasItemCode.Count < 1) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductL7PartsNotes/ProductL7PartsNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductL7PartsNotes/ProductL7PartsNoteAppService.cs index 270a84f0e..b3e2d497f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductL7PartsNotes/ProductL7PartsNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductL7PartsNotes/ProductL7PartsNoteAppService.cs @@ -34,7 +34,7 @@ public class ProductL7PartsNoteAppService : { var entitys = ObjectMapper.Map, List>(inputs); - //转到实现，保存【L7级零件关系】 + //转到实现，保存【L7级物品关系】 await _productL7PartsNoteManager.CreateManyAsync(entitys).ConfigureAwait(false); //var dto = ObjectMapper.Map(entity); @@ -69,7 +69,7 @@ public class ProductL7PartsNoteAppService : //{ // var entity = ObjectMapper.Map(input); - // //转到实现，保存【L7级零件关系】 + // //转到实现，保存【L7级物品关系】 // await _productL7PartsNoteManager.CreateAsync(entity); // var dto = ObjectMapper.Map(entity); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs index 7bb531bc3..51e7f6963 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs @@ -64,18 +64,18 @@ public class PutawayNoteAppService : var isClosed = await _purchaseOrderManager.CheckIsCloseAsync(input.Number,input.SupplierCode, detail.ItemCode).ConfigureAwait(false); if (isClosed) { - throw new UserFriendlyException($"零件名称【{detail.ItemCode}】的订单明细行以关闭无法执行采购上架！"); + throw new UserFriendlyException($"物品名称【{detail.ItemCode}】的订单明细行以关闭无法执行采购上架！"); } var isprice = await _purchasePriceSheetAppService.CheckPurPriceAsync(input.SupplierCode, detail.ItemCode).ConfigureAwait(false); if (isprice) { - throw new UserFriendlyException($"供应商【{input.SupplierCode}】零件名称【{detail.ItemCode}】无采购价格无法执行采购上架！"); + throw new UserFriendlyException($"供应商【{input.SupplierCode}】物品名称【{detail.ItemCode}】无采购价格无法执行采购上架！"); } var erpLocationItem = await _erpLocationItemAppService.CheckItemErpLocationIsAvailable(detail.ItemCode, detail.ToLocationErpCode).ConfigureAwait(false); if (erpLocationItem == null) { - throw new UserFriendlyException($"未找到零件【{detail.ItemCode}】与ERP储位【{detail.ToLocationErpCode}】的开账信息"); + throw new UserFriendlyException($"未找到物品【{detail.ItemCode}】与ERP储位【{detail.ToLocationErpCode}】的开账信息"); } var purchasereDetail = await _purchaseReceiptNoteAppService .GetDetailByItemAndPackingAsync(detail.ItemCode, detail.ToPackingCode).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs index 46c284ca6..71ebb7c44 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs @@ -232,7 +232,7 @@ IPurchasePriceSheetAppService purchasePriceSheetAppService) : base(repository) var isprice = await _purchasePriceSheetAppService.CheckPurPriceAsync(supplierCode, itemCode).ConfigureAwait(false); if (isprice) { - throw new UserFriendlyException($"供应商【{supplierCode}】零件名称【{itemCode}】无采购价格无法执行采购上架！"); + throw new UserFriendlyException($"供应商【{supplierCode}】物品名称【{itemCode}】无采购价格无法执行采购上架！"); } } private async Task> CheckErpLocationCodeAsync(List erpLocationCodes) @@ -387,7 +387,7 @@ IPurchasePriceSheetAppService purchasePriceSheetAppService) : base(repository) { var item = await ItemBasicAclService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", "物品不存在"); + Check.NotNull(item, "ERP料号", "物品不存在"); } protected async Task CheckWarehourseAsync(PurchaseOrderImportInput importInput) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/SaleOrders/SaleOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/SaleOrders/SaleOrderAppService.cs index 6063fe888..59f730479 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/SaleOrders/SaleOrderAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/SaleOrders/SaleOrderAppService.cs @@ -105,7 +105,7 @@ public class SaleOrderAppService : { var item = await ItemBasicAclService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", "物品不存在"); + Check.NotNull(item, "ERP料号", "物品不存在"); } protected async Task CheckWarehourseAsync(SaleOrderImportInput importInput) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/InjectioModelPlans/InjectioModelPlanAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/InjectioModelPlans/InjectioModelPlanAppService.cs index 0301212a3..d5782ab5c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/InjectioModelPlans/InjectioModelPlanAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/InjectioModelPlans/InjectioModelPlanAppService.cs @@ -143,7 +143,7 @@ public class InjectioModelPlanAppService : return bomlist; //if(bomlist.Count==0) //{ - // throw new Exception("Bom中没有查到零件BOM结构"); + // throw new Exception("Bom中没有查到物品BOM结构"); //} //return ExportImportService.Export(bomlist); } @@ -158,7 +158,7 @@ public class InjectioModelPlanAppService : } if (string.IsNullOrEmpty(p_input.ItemCode)) { - throw new UserFriendlyException("输入值零件号为空！"); + throw new UserFriendlyException("输入值ERP料号为空！"); } if (p_input.PlanQty>0) { @@ -182,7 +182,7 @@ public class InjectioModelPlanAppService : } else { - throw new UserFriendlyException($"该单号下没有{p_input.ItemCode}零件"); + throw new UserFriendlyException($"该单号下没有{p_input.ItemCode}物品"); } } else @@ -217,7 +217,7 @@ public class InjectioModelPlanAppService : { var item = await ItemBasicAclService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", "物品不存在"); + Check.NotNull(item, "ERP料号", "物品不存在"); } protected async Task CheckProdLineAsync(InjectioModelPlanImportInput importInput) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/PreparationPlans/PreparationPlanAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/PreparationPlans/PreparationPlanAppService.cs index c42b70ac8..5f004af66 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/PreparationPlans/PreparationPlanAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/PreparationPlans/PreparationPlanAppService.cs @@ -137,7 +137,7 @@ public class PreparationPlanAppService : { var item = await ItemBasicAclService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", "物品不存在"); + Check.NotNull(item, "ERP料号", "物品不存在"); } protected async Task CheckProdLineAsync(PreparationPlanImportInput importInput) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/ProductionPlans/ProductionPlanAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/ProductionPlans/ProductionPlanAppService.cs index 0e42a01d5..f20aa2802 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/ProductionPlans/ProductionPlanAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/ProductionPlans/ProductionPlanAppService.cs @@ -140,7 +140,7 @@ public class ProductionPlanAppService : { var item = await ItemBasicAclService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", "物品不存在"); + Check.NotNull(item, "ERP料号", "物品不存在"); } protected async Task CheckProdLineAsync(ProductionPlanImportInput importInput) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/SupplierAsns/SupplierAsnAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/SupplierAsns/SupplierAsnAppService.cs index 9f5635a00..6d5b7b054 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/SupplierAsns/SupplierAsnAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/SupplierAsns/SupplierAsnAppService.cs @@ -303,14 +303,14 @@ public class SupplierAsnAppService : var item = await ItemBasicAclService.GetByCodeAsync(itemCode).ConfigureAwait(false); if (item == null) { - validationRresult.Add("物品代码", $"物品代码{itemCode}不存在"); + validationRresult.Add("ERP料号", $"ERP料号{itemCode}不存在"); } else { //不是采购件 if (!item.CanBuy) { - validationRresult.Add("物品代码", $"物品{itemCode}不是采购件"); + validationRresult.Add("ERP料号", $"物品{itemCode}不是采购件"); } } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/CountAdjustRequests/CountAdjustRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/CountAdjustRequests/CountAdjustRequestForDongyangAppService.cs index ca4cf3365..a1262e142 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/CountAdjustRequests/CountAdjustRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/CountAdjustRequests/CountAdjustRequestForDongyangAppService.cs @@ -111,7 +111,7 @@ public class CountAdjustRequestForDongyangAppService : CountAdjustRequestAppServ var item = await ItemBasicAclService.GetByCodeAsync(itemCode).ConfigureAwait(false); if (item == null) { - validationRresult.Add("物品代码", $"物品代码{itemCode}不存在"); + validationRresult.Add("ERP料号", $"ERP料号{itemCode}不存在"); } return item; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs index 847bfb6fd..ee7e8d81f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAppService.cs @@ -127,7 +127,7 @@ public class DeliverRequestAppService : { var itemBasic = await ItemBasicAclService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); - Check.NotNull(itemBasic, "物品代码", $"物品 {importInput.ItemCode} 不存在"); + Check.NotNull(itemBasic, "ERP料号", $"物品 {importInput.ItemCode} 不存在"); var area = await _areaApp.GetByCodeAsync(importInput.AreaCode).ConfigureAwait(false); @@ -152,7 +152,7 @@ public class DeliverRequestAppService : if (importInput.Qty <= 0) { - throw new UserFriendlyException($"物料号 {importInput.ItemCode} 数量需要大于0。"); + throw new UserFriendlyException($"ERP料号 {importInput.ItemCode} 数量需要大于0。"); } var transactionType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.Deliver, EnumTransSubType.Deliver_FIS).ConfigureAwait(false); @@ -175,7 +175,7 @@ public class DeliverRequestAppService : if (balanceSumQty < importInput.Qty) { - throw new UserFriendlyException($"物料号 {importInput.ItemCode} " + + throw new UserFriendlyException($"ERP料号 {importInput.ItemCode} " + $"在库位类型 {transactionType.OutLocationTypes.JoinAsString(",")}," + $"库区 {importInput.AreaCode} " + $"状态 {transactionType.OutInventoryStatuses.JoinAsString(",")}" + @@ -300,14 +300,14 @@ public class DeliverRequestAppService : if (transactionType.ItemStatuses.Any() && !transactionType.ItemStatuses.Contains(item.Status)) { throw new UserFriendlyException( - $"物料号 {item.Code} 物料状态 {item.Status} 不在 {transactionType.ItemStatuses.JoinAsString(",")} 中。"); + $"ERP料号 {item.Code} 物料状态 {item.Status} 不在 {transactionType.ItemStatuses.JoinAsString(",")} 中。"); } if (item.Type != null && transactionType.ItemTypes.Any() && !transactionType.ItemTypes.Contains(Enum.Parse(item.Type))) { throw new UserFriendlyException( - $"物料号 {item.Code} 物料类型 {item.Type} 不在 {transactionType.ItemTypes.JoinAsString(",")} 中。"); + $"ERP料号 {item.Code} 物料类型 {item.Type} 不在 {transactionType.ItemTypes.JoinAsString(",")} 中。"); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs index 015dd3cf7..67eac6b97 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs @@ -126,7 +126,7 @@ public class DeliverRequestFisAppService : { if (balanceSumQty < detail.Qty) { - throw new UserFriendlyException($"物料号 {detail.ItemCode} " + + throw new UserFriendlyException($"ERP料号 {detail.ItemCode} " + $"在库位类型 {transactionType.OutLocationTypes.JoinAsString(",")}," + $"库区 {detail.AreaCode} " + $"状态 {transactionType.OutInventoryStatuses.JoinAsString(",")}" + @@ -144,7 +144,7 @@ public class DeliverRequestFisAppService : var sbStatuses = string.Empty; transactionType.OutInventoryStatuses.ForEach(p => sbLocationTypes += " " + p.GetDisplayName() + " "); throw new UserFriendlyException( - $"没有物品代码为【{itemBasicDto.Code}】，" + + $"没有ERP料号为【{itemBasicDto.Code}】，" + $"数量为【{detail.Qty}】，" + $"出库库位类型为【{sbLocationTypes}】，" + $"区域为【{detail.AreaCode}】，" + @@ -156,7 +156,7 @@ public class DeliverRequestFisAppService : { if (itemcBasicDto == null) { - throw new UserFriendlyException($"物品代码为【{itemCode}】不存在"); + throw new UserFriendlyException($"ERP料号为【{itemCode}】不存在"); } } @@ -230,7 +230,7 @@ public class DeliverRequestFisAppService : if (item == null) { - validationRresult.Add("物品代码", $"物品代码{importInput.ItemCode}不存在"); + validationRresult.Add("ERP料号", $"ERP料号{importInput.ItemCode}不存在"); } if (importInput.Qty <= 0) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs index a04082dfe..876d6017b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/InjectionPlanRequests/InjectionPlanRequestAppService.cs @@ -193,7 +193,7 @@ public class InjectionPlanRequestAppService : SfsStoreRequestAppServiceBase - /// 根据物品代码+批次,获得报检单信息 + /// 根据ERP料号+批次,获得报检单信息 /// /// /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestAppService.cs index 2bef84df3..d00810a4f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestAppService.cs @@ -390,7 +390,7 @@ public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase(item.Type))) { throw new UserFriendlyException( - $"物料号 {item.Code} 物料类型 {item.Type} 不在 {transactionType.ItemTypes.JoinAsString(",")} 中。"); + $"ERP料号 {item.Code} 物料类型 {item.Type} 不在 {transactionType.ItemTypes.JoinAsString(",")} 中。"); } switch (transInOut) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReturnRequests/PurchaseReturnRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReturnRequests/PurchaseReturnRequestAppService.cs index 4b033f9bc..100e9ef92 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReturnRequests/PurchaseReturnRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/PurchaseReturnRequests/PurchaseReturnRequestAppService.cs @@ -220,7 +220,7 @@ public class PurchaseReturnRequestAppService : if (purchaseOrderDetailDto == null) { - throw new UserFriendlyException($"未找到物品代码为【{balanceDto.ItemCode}】，批次为【{balanceDto.Lot}】的订单详情"); + throw new UserFriendlyException($"未找到ERP料号为【{balanceDto.ItemCode}】，批次为【{balanceDto.Lot}】的订单详情"); } detail.PoLine = purchaseOrderDetailDto.PoLine; @@ -323,7 +323,7 @@ public class PurchaseReturnRequestAppService : { if (balance.Qty < importInput.Qty) { - validationRresult.Add("数量", $"物品代码{importInput.ItemCode}的库存余额数量{balance.Qty}小于导入数量{importInput.Qty}"); + validationRresult.Add("数量", $"ERP料号{importInput.ItemCode}的库存余额数量{balance.Qty}小于导入数量{importInput.Qty}"); } } return balance; @@ -335,17 +335,17 @@ public class PurchaseReturnRequestAppService : if (item == null) { - validationRresult.Add("物品代码", $"物品代码{importInput.ItemCode}不存在"); + validationRresult.Add("ERP料号", $"ERP料号{importInput.ItemCode}不存在"); } else { if (item.CanMake) { - validationRresult.Add("制造", $"物品代码 {importInput.ItemCode} 是制造件，不允许退货"); + validationRresult.Add("制造", $"ERP料号 {importInput.ItemCode} 是制造件，不允许退货"); } if (item.IsRecycled) { - validationRresult.Add("回收件", $"物品代码 {importInput.ItemCode} 是回收件，不允许退货"); + validationRresult.Add("回收件", $"ERP料号 {importInput.ItemCode} 是回收件，不允许退货"); } } return item; @@ -400,14 +400,14 @@ public class PurchaseReturnRequestAppService : if (transactionType.ItemStatuses.Any() && !transactionType.ItemStatuses.Contains(item.Status)) { throw new UserFriendlyException( - $"物品代码 {item.Code} 物料状态 {item.Status} 不在 {transactionType.ItemStatuses.JoinAsString(",")} 中。"); + $"ERP料号 {item.Code} 物料状态 {item.Status} 不在 {transactionType.ItemStatuses.JoinAsString(",")} 中。"); } if (item.Type != null && transactionType.ItemTypes.Any() && !transactionType.ItemTypes.Contains(Enum.Parse(item.Type))) { throw new UserFriendlyException( - $"物品代码 {item.Code} 物料类型 {item.Type} 不在 {transactionType.ItemTypes.JoinAsString(",")} 中。"); + $"ERP料号 {item.Code} 物料类型 {item.Type} 不在 {transactionType.ItemTypes.JoinAsString(",")} 中。"); } switch (transInOut) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ScrapRequests/ScrapRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ScrapRequests/ScrapRequestAppService.cs index 63091e918..5cb42b561 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ScrapRequests/ScrapRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ScrapRequests/ScrapRequestAppService.cs @@ -173,7 +173,7 @@ public class ScrapRequestAppService : SfsStoreRequestAppServiceBase var item = await ItemBasicAclService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); if (item == null) { - validationRresul.Add(new ValidationResult($"物品代码{importInput.ItemCode}不存在", new string[] { "物品代码" })); + validationRresul.Add(new ValidationResult($"ERP料号{importInput.ItemCode}不存在", new string[] { "ERP料号" })); } if (importInput.Qty <= 0) @@ -235,7 +235,7 @@ public class ScrapRequestAppService : SfsStoreRequestAppServiceBase if (balance.Qty < importInput.Qty) { - throw new ArgumentException($"物品代码 {importInput.ItemCode}的库存余额数量{balance.Qty}小于导入数量{importInput.Qty}。"); + throw new ArgumentException($"ERP料号 {importInput.ItemCode}的库存余额数量{balance.Qty}小于导入数量{importInput.Qty}。"); } return balance; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs index cc8cab1ef..7a6e2fd67 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs @@ -377,12 +377,12 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase GetFromAppServiceAsync(string itemCode) { var item = await _appService.GetByCodeAsync(itemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", $"物品 {itemCode} 不存在"); + Check.NotNull(item, "ERP料号", $"物品 {itemCode} 不存在"); return item; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain.Shared/Localization/Store/zh-Hans.json b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain.Shared/Localization/Store/zh-Hans.json index 278b5a50b..812e5d592 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain.Shared/Localization/Store/zh-Hans.json +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain.Shared/Localization/Store/zh-Hans.json @@ -12,7 +12,7 @@ "AbpIdentity": "权限控制", "Warehouse": "仓库", "Area": "区域", - "AreaItem": "区域零件", + "AreaItem": "区域物品", "InterfaceCalendar": "日历接口", "Calendar": "日历", "Company": "公司", @@ -37,7 +37,7 @@ "LocationGroup": "库位组", "UserWorkGroup": "工作组", "Location": "库位", - "ItemStoreRelation": "库位零件关系维护", + "ItemStoreRelation": "库位物品关系维护", "InventoryLocationCapacity": "库位可用容量", "Workshop": "车间", "ProductionLine": "生产线", diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Bases/SfsStoreDetailEntityBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Bases/SfsStoreDetailEntityBase.cs index ea3c6215f..1b061290e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Bases/SfsStoreDetailEntityBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Bases/SfsStoreDetailEntityBase.cs @@ -22,7 +22,7 @@ public abstract class SfsStoreDetailEntityBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Equipments/EquipmentRecord.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Equipments/EquipmentRecord.cs index 1fed8946a..2b760776c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Equipments/EquipmentRecord.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Equipments/EquipmentRecord.cs @@ -22,7 +22,7 @@ public class EquipmentRecord:SfsAggregateRootBase /// public string BarCode { get; set; } /// - /// 零件号 + /// ERP料号 /// public string PartCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Equipments/EquipmentRecordManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Equipments/EquipmentRecordManager.cs index cf4486906..d8816efb4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Equipments/EquipmentRecordManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Equipments/EquipmentRecordManager.cs @@ -40,13 +40,13 @@ public class EquipmentRecordManager : DomainService, IEquipmentRecordManager public async Task> Bind(List p_ls) { List errors=new List(); - // var list= p_ls.GroupBy(p => new { p.EqptCode, p.PartCode }).Select(p=>new { EqptCode= p.Key.EqptCode, PartCode= p.Key.PartCode,SumQty=p.Sum(p=>p.Qty)});//导入零件 - // var partialErrors1=list.GroupBy(p => p.EqptCode).Where(g =>g.Count()>1).Select(p => new EquipmentRecordErrorDTO() { EqptCode= p.Key,PartCode=string.Empty,Error=$"同器具代码有{p.Count().ToString()}种零件!" }); - // errors.AddRange(partialErrors1.ToList());//同容器放不同零件校验 + // var list= p_ls.GroupBy(p => new { p.EqptCode, p.PartCode }).Select(p=>new { EqptCode= p.Key.EqptCode, PartCode= p.Key.PartCode,SumQty=p.Sum(p=>p.Qty)});//导入物品 + // var partialErrors1=list.GroupBy(p => p.EqptCode).Where(g =>g.Count()>1).Select(p => new EquipmentRecordErrorDTO() { EqptCode= p.Key,PartCode=string.Empty,Error=$"同器具代码有{p.Count().ToString()}种物品!" }); + // errors.AddRange(partialErrors1.ToList());//同容器放不同物品校验 // var ls=p_ls.Select(p => p.EqptCode).Distinct().ToList();//录入的器具记录代码列表 // var Locs=_locService.GetEquipmentLocAsync(ls).Result;//获取器具库位关系 - // var parts =_partService.GetEquipmentPartCodesAsync(ls).Result;//获取器具零件关系 - // //零件和器具关系校验 + // var parts =_partService.GetEquipmentPartCodesAsync(ls).Result;//获取器具物品关系 + // //物品和器具关系校验 // var partErrorQery = from itm in list // join itm1 in parts on // new { itm.EqptCode, PartCode = itm.PartCode } equals new { EqptCode = itm1.Code, PartCode = itm1.PartCode } @@ -57,7 +57,7 @@ public class EquipmentRecordManager : DomainService, IEquipmentRecordManager // { // EqptCode = itm.EqptCode, // PartCode = itm.PartCode, - // Error = $"器具零件关系不存在！" + // Error = $"器具物品关系不存在！" // }; // errors.AddRange(partErrorQery.ToList()); // var query= await _repositoryCap.GetQueryableAsync().ConfigureAwait(false); @@ -67,9 +67,9 @@ public class EquipmentRecordManager : DomainService, IEquipmentRecordManager // join itm1 in list.ToList() on itm.EqptCode equals itm1.EqptCode // where itm.PartCode != itm.PartCode // select new EquipmentRecordErrorDTO() { - // EqptCode = itm.EqptCode,PartCode=itm.PartCode ,Error=$"录入器具代码{itm.EqptCode}零件代码{itm.PartCode}与器具容量{itm1.EqptCode}零件代码{itm1.PartCode}不符！" + // EqptCode = itm.EqptCode,PartCode=itm.PartCode ,Error=$"录入器具代码{itm.EqptCode}ERP料号{itm.PartCode}与器具容量{itm1.EqptCode}ERP料号{itm1.PartCode}不符！" // }; - // errors.AddRange(partialErrors2.ToList());//导入记录和容量记录零件不是同一零件 + // errors.AddRange(partialErrors2.ToList());//导入记录和容量记录物品不是同一物品 // var existList = from itm in list // join itm1 in capExistList // on new { itm.EqptCode, itm.PartCode } equals new { itm1.EqptCode, itm1.PartCode } @@ -143,13 +143,13 @@ public class EquipmentRecordManager : DomainService, IEquipmentRecordManager public async Task> UnBind(List p_ls) { List errors = new List(); - //var list = p_ls.GroupBy(p => new { p.EqptCode, p.PartCode }).Select(p => new { EqptCode = p.Key.EqptCode, PartCode = p.Key.PartCode, SumQty = p.Sum(p => p.Qty) });//导入零件 - //var partialErrors1 = list.GroupBy(p => p.EqptCode).Where(g => g.Count() > 1).Select(p => new EquipmentRecordErrorDTO() { EqptCode = p.Key, PartCode = string.Empty, Error = $"同器具代码有{p.Count().ToString()}种零件!" }); - //errors.AddRange(partialErrors1.ToList());//同容器放不同零件校验 + //var list = p_ls.GroupBy(p => new { p.EqptCode, p.PartCode }).Select(p => new { EqptCode = p.Key.EqptCode, PartCode = p.Key.PartCode, SumQty = p.Sum(p => p.Qty) });//导入物品 + //var partialErrors1 = list.GroupBy(p => p.EqptCode).Where(g => g.Count() > 1).Select(p => new EquipmentRecordErrorDTO() { EqptCode = p.Key, PartCode = string.Empty, Error = $"同器具代码有{p.Count().ToString()}种物品!" }); + //errors.AddRange(partialErrors1.ToList());//同容器放不同物品校验 //var ls = p_ls.Select(p => p.EqptCode).Distinct().ToList();//录入的器具记录代码列表 //var Locs = _locService.GetEquipmentLocAsync(ls).Result;//获取器具库位关系 - //var parts = _partService.GetEquipmentPartCodesAsync(ls).Result;//获取器具零件关系 - ////零件和器具关系校验 + //var parts = _partService.GetEquipmentPartCodesAsync(ls).Result;//获取器具物品关系 + ////物品和器具关系校验 //var partErrorQery = from itm in list // join itm1 in parts on // new { itm.EqptCode, PartCode = itm.PartCode } equals new { EqptCode = itm1.Code, PartCode = itm1.PartCode } @@ -160,7 +160,7 @@ public class EquipmentRecordManager : DomainService, IEquipmentRecordManager // { // EqptCode = itm.EqptCode, // PartCode = itm.PartCode, - // Error = $"器具零件关系不存在！" + // Error = $"器具物品关系不存在！" // }; //errors.AddRange(partErrorQery.ToList()); //var query = await _repositoryCap.GetQueryableAsync().ConfigureAwait(false); @@ -173,9 +173,9 @@ public class EquipmentRecordManager : DomainService, IEquipmentRecordManager // { // EqptCode = itm.EqptCode, // PartCode = itm.PartCode, - // Error = $"录入器具代码{itm.EqptCode}零件代码{itm.PartCode}与器具容量{itm1.EqptCode}零件代码{itm1.PartCode}不符！" + // Error = $"录入器具代码{itm.EqptCode}ERP料号{itm.PartCode}与器具容量{itm1.EqptCode}ERP料号{itm1.PartCode}不符！" // }; - //errors.AddRange(partialErrors2.ToList());//导入记录和器具容量记录零件不是同一零件 + //errors.AddRange(partialErrors2.ToList());//导入记录和器具容量记录物品不是同一物品 //var existList = from itm in list // join itm1 in capExistList // on new { itm.EqptCode, itm.PartCode } equals new { itm1.EqptCode, itm1.PartCode } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/DataExchangeHelperManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/DataExchangeHelperManager.cs index 57cce413a..6eaf64ad2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/DataExchangeHelperManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/DataExchangeHelperManager.cs @@ -93,7 +93,7 @@ public class DataExchangeHelperManager : DomainService, IDataExchangeHelperManag { foreach (var inventoryTransferNoteDetail in inventoryTransferNote.Details) { - //如果库存转移的是天津埃驰的门板，要特殊处理，实际转移的是L7零件，并汇总 + //如果库存转移的是天津埃驰的门板，要特殊处理，实际转移的是L7物品，并汇总 if (IsBenzJisPart(inventoryTransferNoteDetail.ItemCode)) { await SumComponentPartDetailsAsync(inventoryTransferNoteDetail, transferDataExchangeDetails).ConfigureAwait(false); @@ -186,14 +186,14 @@ public class DataExchangeHelperManager : DomainService, IDataExchangeHelperManag var productNo = inventoryTransferNoteDetail.SupplierBatch; //产品号 //TODO 为什么放在这里？ var position = inventoryTransferNoteDetail.FromLot; //位置信息 - //取得对应的L7零件信息 + //取得对应的L7物品信息 var l7PartNote = await _productL7PartsNoteManager.GetL7PartsNoteAsync(productNo, position, configuration, true).ConfigureAwait(false); - //取得对应的L7零件信息 + //取得对应的L7物品信息 if (l7PartNote == null) { Logger.LogWarning( - $"当前发货的物料(产品码 {productNo} ，位置 {position} ，配置码 {configuration} )找不到对应的L7级零件信息，请确认基础数据是否完整！"); + $"当前发货的物料(产品码 {productNo} ，位置 {position} ，配置码 {configuration} )找不到对应的L7级物品信息，请确认基础数据是否完整！"); return; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CheckJobs/CheckJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CheckJobs/CheckJobDetail.cs index 600a77af0..bfeee0a9d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CheckJobs/CheckJobDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CheckJobs/CheckJobDetail.cs @@ -14,7 +14,7 @@ public class CheckJobDetail : SfsJobDetailEntityBase, IHasQty public string Order { get; set; } /// - /// 客户物品号 + /// 客户ERP料号 /// public string CustomerItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJob.cs index 274bdf2cb..e27e0a4ca 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJob.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountJob.cs @@ -57,9 +57,9 @@ public class CountJob : SfsJobAggregateRootBase public string Description { get; set; } /// - /// 物料代码 + /// ERP料号 /// - [Display(Name = "物料代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobDetail.cs index 5a7678225..14eb15b27 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobDetail.cs @@ -12,9 +12,9 @@ public class InjectionPlanJobDetail : SfsDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobManager.cs index a324f81c0..8c6ce4645 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InjectionPlanJobs/InjectionPlanJobManager.cs @@ -42,7 +42,7 @@ public class InjectionPlanJobManager : SfsJobManagerBase - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobDetail.cs index f14d1f76c..dd075c2df 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobDetail.cs @@ -11,7 +11,7 @@ public class AssembleIssueJobDetail : SfsDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobManager.cs index f7cab0c71..6d6a748b3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobManager.cs @@ -44,7 +44,7 @@ public class AssembleIssueJobManager : SfsJobManagerBase - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs index c57029b71..9e5d09b1e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs @@ -45,7 +45,7 @@ public class CoatingIssueJobManager : SfsJobManagerBase - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobManager.cs index 5feeba1e0..9a5600bf7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobManager.cs @@ -45,7 +45,7 @@ public class InjectionIssueJobManager : SfsJobManagerBase - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobManager.cs index dd45e4f9b..992eb92a1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobManager.cs @@ -45,7 +45,7 @@ public class KittingIssueJobManager : SfsJobManagerBase - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobManager.cs index a2098810d..caa3a1837 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobManager.cs @@ -45,7 +45,7 @@ public class SparePartIssueJobManager : SfsJobManagerBase - /// 子零件明细列表 + /// 子物品明细列表 /// [NotMapped] public List MaterialDetails { get; set; } = new List(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/ProductRecycleJobMaterialDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/ProductRecycleJobMaterialDetail.cs index 308cb7ba2..6dbe88a72 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/ProductRecycleJobMaterialDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/ProductRecycleJobs/ProductRecycleJobMaterialDetail.cs @@ -9,7 +9,7 @@ public class ProductRecycleJobMaterialDetail { /// - /// 零件代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PutawayJobs/PutawayInventory.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PutawayJobs/PutawayInventory.cs index cfc28229f..c28fb4e25 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PutawayJobs/PutawayInventory.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PutawayJobs/PutawayInventory.cs @@ -10,7 +10,7 @@ public class PutawayInventory public string PackingCode { get; set; } /// - /// 物料代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PutawayJobs/PutawayJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PutawayJobs/PutawayJobManager.cs index a410ce9f0..2ba139594 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PutawayJobs/PutawayJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PutawayJobs/PutawayJobManager.cs @@ -65,7 +65,7 @@ public class PutawayJobManager : SfsJobManagerBase //检查所有库存的状态是否允许上架 //TODO 隔离和报废状态的怎么办？ await CheckInventoryStatusOfBalances(balances).ConfigureAwait(false); - //将库存余额按零件号分组，分别计算可用库位 + //将库存余额按ERP料号分组，分别计算可用库位 var balanceGroupByItemCodes = balances.GroupBy(p => p.ItemCode); //定义推荐库位信息列表，保存已经分配的库位信息，用于避免混装库位的重复计算 var recommendLocationInfos = new List(); @@ -235,7 +235,7 @@ public class PutawayJobManager : SfsJobManagerBase detail.RecommendToLocationErpCode = noteDetail.LocationErpCode; } - //按零件，ERP储位 分组 + //按物品，ERP储位 分组 var group = putawayJob.Details.GroupBy(p => new { p.ItemCode, @@ -295,7 +295,7 @@ public class PutawayJobManager : SfsJobManagerBase #region New /// - /// 根据 零件 计算 托 推荐库位 + /// 根据 物品 计算 托 推荐库位 /// /// /// @@ -313,7 +313,7 @@ public class PutawayJobManager : SfsJobManagerBase locationCode = await GetLocationOfSpecialStatuses(status).ConfigureAwait(false); return locationCode; } - //从零件存储关系中获取可用的库位列表 + //从物品存储关系中获取可用的库位列表 var locationInfoInput = await BuildLocationInfoInputsAsync(itemCodes).ConfigureAwait(false); //从库存容量中获取可用库位列表，并根据规则排序后生成可用库位队列 var locationInfos = await _locationCapacityAclService.GetUsableListAsync(locationInfoInput).ConfigureAwait(false); @@ -377,7 +377,7 @@ public class PutawayJobManager : SfsJobManagerBase } /// - /// 根据 零件 计算 箱 推荐库位 + /// 根据 物品 计算 箱 推荐库位 /// /// /// @@ -389,7 +389,7 @@ public class PutawayJobManager : SfsJobManagerBase ICollection recommendLocationInfos) { - //从零件存储关系中获取可用的库位列表 + //从物品存储关系中获取可用的库位列表 var locationInfoInput = await BuildLocationInfoInputsAsync(itemCode).ConfigureAwait(false); //从库存容量中获取可用库位列表，并根据规则排序后生成可用库位队列 var locationInfos = await _locationCapacityAclService.GetUsableListAsync(locationInfoInput).ConfigureAwait(false); @@ -633,7 +633,7 @@ public class PutawayJobManager : SfsJobManagerBase } /// - /// 获取 库位零件对应关系 + /// 获取 库位物品对应关系 /// /// /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobDetailEntityBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobDetailEntityBase.cs index 4faaa7d68..c22291286 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobDetailEntityBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobDetailEntityBase.cs @@ -32,7 +32,7 @@ public abstract class SfsJobDetailEntityBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendDetailEntityBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendDetailEntityBase.cs index 1a9a5ce10..e33cc4418 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendDetailEntityBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendDetailEntityBase.cs @@ -30,7 +30,7 @@ public abstract class SfsJobRecommendDetailEntityBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendFromDetailEntityBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendFromDetailEntityBase.cs index 3e0071ed7..2da2f9830 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendFromDetailEntityBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendFromDetailEntityBase.cs @@ -30,7 +30,7 @@ public abstract class SfsJobRecommendFromDetailEntityBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendToDetailEntityBase.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendToDetailEntityBase.cs index ec39082a9..5d7b4895c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendToDetailEntityBase.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobRecommendToDetailEntityBase.cs @@ -15,7 +15,7 @@ public abstract class SfsJobRecommendToDetailEntityBase { /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJobDetail.cs index ed6295191..58b1b782e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJobDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/TransferLibJobs/TransferLibJobDetail.cs @@ -48,7 +48,7 @@ public class TransferLibJobDetail : SfsDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } @@ -428,7 +428,7 @@ public class TransferLibJobDetail : SfsDetailEntityBase public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushInventoryTotal.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushInventoryTotal.cs index d6eecf3dd..65307c65b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushInventoryTotal.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushInventoryTotal.cs @@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Domain; public class BackFlushInventoryTotal { /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushNote.cs index a577327d1..1160ac4f1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushNote.cs @@ -37,7 +37,7 @@ public class BackFlushNote : SfsStoreAggregateRootBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushNoteManager.cs index d688d372c..4df9f26e2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/BackFlushNotes/BackFlushNoteManager.cs @@ -49,7 +49,7 @@ public class BackFlushNoteManager : SfsStoreManagerBase backFlushNoteList = new List(); - // ////获取所有成品的零件号 + // ////获取所有成品的ERP料号 // //var productItemCodeList = productReceiptNote.Details.Select(p => p.ItemCode).Distinct().ToList(); // ////一次性获得所有BOM信息避免每个明细都查询一遍；false 为bom不展开，便于测试 // //var totalBomList = await GetBomListByProcuctItemCodeList(productItemCodeList, false); - // ////根据回冲记录获取成品零件种类和数量，并获取相关要消耗的原材料库存 + // ////根据回冲记录获取成品物品种类和数量，并获取相关要消耗的原材料库存 // //var productSumList = productReceiptNote.Details.GroupBy(p => new { p.ItemCode, p.RawLocation, p.Qty }) // // .Select(s => new BackFlushInventoryTotal // // { @@ -183,32 +183,32 @@ public class BackFlushNoteManager : SfsStoreManagerBase n.Qty), // // }).ToList(); - // ////根据父级零件汇总的数量，获取BOM子表明细原材料的数量 + // ////根据父级物品汇总的数量，获取BOM子表明细原材料的数量 // //var subInventoryTotalList = new List(); // ////【判断】是否需要下线结算 TODO - // ////遍历子零件明细表获取零件是否是下线结算件的信息，如果是则加入到下线结算列表 + // ////遍历子物品明细表获取物品是否是下线结算件的信息，如果是则加入到下线结算列表 // //List offlineSettlementNotes = new List(); // //foreach (var productSumItem in productSumList) // //{ // // var subBomList = totalBomList.Where(p => p.Product == productSumItem.ItemCode).ToList(); - // // //根据bom和父级零件总数获取子零件总数,然后将子零件总数汇总进 总零件数量 + // // //根据bom和父级物品总数获取子物品总数,然后将子物品总数汇总进 总物品数量 // // await GetSubBackFlushInventoryList(productSumItem, subBomList, subInventoryTotalList, offlineSettlementNotes); // //} // //////【是】 创建【下线结算记录】 // ////if (offlineSettlementNotes.Count > 0) // ////{ - // //// //如果零件为，创建下线结算记录； //TODO 如果有原料是下线结算零件，则生成下线结算记录， + // //// //如果物品为，创建下线结算记录； //TODO 如果有原料是下线结算物品，则生成下线结算记录， // //// //await _offlineSettlementNoteManager.CreateByBackFlushNoteListAsync(backFlushNoteList); // //// await _offlineSettlementNoteManager.CreateByBackFlushInventoryTotalListAsync(productReceiptNote, offlineSettlementNotes); // ////} - // ////根据子零件回冲的库位和数量获取子零件的库存信息 + // ////根据子物品回冲的库位和数量获取子物品的库存信息 // //var subItemInventoryTotalList = new List(); // //foreach (var subInventoryTotal in subInventoryTotalList) // //{ @@ -216,7 +216,7 @@ public class BackFlushNoteManager : SfsStoreManagerBase - ///// 根据bom和父级零件总数获取子零件总数,然后将子零件总数汇总进 总零件数量 + ///// 根据bom和父级物品总数获取子物品总数,然后将子物品总数汇总进 总物品数量 ///// ///// ///// @@ -277,7 +277,7 @@ public class BackFlushNoteManager : SfsStoreManagerBase p.Product == detail.ItemCode).ToList(); // //构造库存入库明细 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CountNotes/CountNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CountNotes/CountNoteManager.cs index 427684168..ac8fb4abf 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CountNotes/CountNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CountNotes/CountNoteManager.cs @@ -192,7 +192,7 @@ public class CountNoteManager : SfsStoreManagerBase, { var item = await ItemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", $"物品 {detail.ItemCode} 不存在"); + Check.NotNull(item, "ERP料号", $"物品 {detail.ItemCode} 不存在"); detail.ItemName = item.Name; detail.ItemDesc1 = item.Desc1; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/InjectionPlanNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/InjectionPlanNoteDetail.cs index b752339d0..f342de24a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/InjectionPlanNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InjectionPlanNotes/InjectionPlanNoteDetail.cs @@ -12,7 +12,7 @@ public class InjectionPlanNoteDetail : SfsStoreDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InventoryTransferNotes/InventoryTransferNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InventoryTransferNotes/InventoryTransferNoteManager.cs index e128d7771..433fa1738 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InventoryTransferNotes/InventoryTransferNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InventoryTransferNotes/InventoryTransferNoteManager.cs @@ -19,7 +19,7 @@ public class InventoryTransferNoteManager : SfsStoreManagerBase CreateAsync(InventoryTransferNote inventoryTransferNote) { // 统一在TransactionManager中检查 - // //判断每个零件是否有对应关系 + // //判断每个物品是否有对应关系 // foreach (var detail in inventoryTransferNote.Details) // { // await _itemStoreRelationAppService.CheckByItemAndLocationAsync(detail.ItemCode, detail.ToLocationCode); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDetail.cs index a4244773a..6b5a1f6cd 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDetail.cs @@ -11,7 +11,7 @@ public class AssembleIssueNoteDetail : SfsStoreDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetail.cs index 08f96fca6..55d9ea0eb 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetail.cs @@ -11,7 +11,7 @@ public class CoatingIssueNoteDetail : SfsStoreDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs index 2ebdcc003..648399927 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs @@ -11,7 +11,7 @@ public class InjectionIssueNoteDetail : SfsStoreDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/KittingIssueNotes/KittingIssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/KittingIssueNotes/KittingIssueNoteDetail.cs index cb6d9e012..ef3ffbb99 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/KittingIssueNotes/KittingIssueNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/KittingIssueNotes/KittingIssueNoteDetail.cs @@ -11,7 +11,7 @@ public class KittingIssueNoteDetail : SfsStoreDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/SparePartIssueNotes/SparePartIssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/SparePartIssueNotes/SparePartIssueNoteDetail.cs index d36c4d424..3dfeb41a6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/SparePartIssueNotes/SparePartIssueNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/SparePartIssueNotes/SparePartIssueNoteDetail.cs @@ -11,7 +11,7 @@ public class SparePartIssueNoteDetail : SfsStoreDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ItemTransformNotes/ItemTransformNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ItemTransformNotes/ItemTransformNoteDetail.cs index 2be6bbb33..c7c9fa55c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ItemTransformNotes/ItemTransformNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ItemTransformNotes/ItemTransformNoteDetail.cs @@ -57,7 +57,7 @@ public class ItemTransformNoteDetail : SfsStoreDetailEntityBase public string FromContainerCode { get; set; } /// - /// 目标物品代码 + /// 目标ERP料号 /// public string ToItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/JisProductReceiptNotes/JisProductReceiptNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/JisProductReceiptNotes/JisProductReceiptNoteManager.cs index 5c4295c20..c65bf7acd 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/JisProductReceiptNotes/JisProductReceiptNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/JisProductReceiptNotes/JisProductReceiptNoteManager.cs @@ -152,20 +152,20 @@ public class JisProductReceiptNoteManager : SfsStoreManagerBase 0) { @@ -234,7 +234,7 @@ public class JisProductReceiptNoteManager : SfsStoreManagerBase 0) { //执行出库操作 @@ -303,7 +303,7 @@ public class JisProductReceiptNoteManager : SfsStoreManagerBase - /// 插入对应的零件基础信息 + /// 插入对应的物品基础信息 /// private static async Task BuildItemCreateInputAsync(string program, string productNo, string configuration, string fata, string position, string prodLine) { @@ -402,7 +402,7 @@ public class JisProductReceiptNoteManager : SfsStoreManagerBase - /// 添加L7零件到对应的List + /// 添加L7物品到对应的List /// /// /// @@ -507,7 +507,7 @@ public class JisProductReceiptNoteManager : SfsStoreManagerBase p.ItemCode == noteDetail.ItemCode); if (productPlanDetail != null) @@ -516,7 +516,7 @@ public class JisProductReceiptNoteManager : SfsStoreManagerBase p.ItemCode == subBom.Component && p.RawLocationCode == productSumItem.RawLocationCode && p.Qty == productSumItem.Qty); if (item == null) { - ////判断子零件是不是下线结算件，如果是就加入下线结算的列表；如果不是加入正常的回冲列表 + ////判断子物品是不是下线结算件，如果是就加入下线结算的列表；如果不是加入正常的回冲列表 //var itemBase = await _itemBasicAppService.GetByNameAsync(subBom.Component); item = new BackFlushInventoryTotal() diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/KittingPackagingNotes/KittingPackagingNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/KittingPackagingNotes/KittingPackagingNoteDetail.cs index ef3523c43..5dd9ff7d0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/KittingPackagingNotes/KittingPackagingNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/KittingPackagingNotes/KittingPackagingNoteDetail.cs @@ -5,9 +5,9 @@ namespace Win_in.Sfs.Wms.Store.Domain; public class KittingPackagingNoteDetail : SfsStoreDetailEntityBase { /// - /// 物品代码 + /// ERP料号 /// - [Display(Name = "物品代码")] + [Display(Name = "ERP料号")] public string ItemCode { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OfflineSettlementNotes/OfflineSettlementNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OfflineSettlementNotes/OfflineSettlementNoteManager.cs index f4cf6c2b6..76304d35d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OfflineSettlementNotes/OfflineSettlementNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OfflineSettlementNotes/OfflineSettlementNoteManager.cs @@ -56,7 +56,7 @@ public class OfflineSettlementNoteManager : // Item = detail.Item, // 物品 - // ItemCode = note.Number, // 物品代码 + // ItemCode = note.Number, // ERP料号 // Batch = detail.Batch, // 产品批次 @@ -107,7 +107,7 @@ public class OfflineSettlementNoteManager : // Item = detail.Item, // 物品 - // ItemCode = note.Number, // 物品代码 + // ItemCode = note.Number, // ERP料号 // Batch = detail.Batch, // 产品批次 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/IProductL7PartsNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/IProductL7PartsNoteManager.cs index f84481510..7f745cf7e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/IProductL7PartsNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/IProductL7PartsNoteManager.cs @@ -6,7 +6,7 @@ public interface IProductL7PartsNoteManager : ISfsStoreManager - /// 获取对应的L7零件信息 + /// 获取对应的L7物品信息 /// /// /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNote.cs index 4ec11082a..e2a3486d0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNote.cs @@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Entities; namespace Win_in.Sfs.Wms.Store.Domain; /// -/// MesL7级零件对照关系 +/// MesL7级物品对照关系 /// public class ProductL7PartsNote : SfsStoreAggregateRootBase, IHasNumber { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNoteDetail.cs index bc30dbf9e..e430226af 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNoteDetail.cs @@ -41,7 +41,7 @@ public class ProductL7PartsNoteDetail : SfsStoreDetailEntityBase public string Configuration { get; set; } /// - /// L7零件号 + /// L7ERP料号 /// public string L7Part { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNoteManager.cs index 4c7aac564..e9b163676 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductL7PartsNotes/ProductL7PartsNoteManager.cs @@ -19,7 +19,7 @@ public class ProductL7PartsNoteManager : SfsStoreManagerBase - /// 获取对应的L7零件信息 + /// 获取对应的L7物品信息 /// /// /// @@ -36,7 +36,7 @@ public class ProductL7PartsNoteManager : SfsStoreManagerBase CreateAsync(ProductL7PartsNote ProductL7PartsNote) { - //保存相关L7级零件单据 + //保存相关L7级物品单据 return await base.CreateAsync(ProductL7PartsNote).ConfigureAwait(false); } @@ -77,7 +77,7 @@ public class ProductL7PartsNoteManager : SfsStoreManagerBase public async Task CreateAsync(List details) { - //获取所有的L7零件信息，并获取零件是不是采购件、制造件 + //获取所有的L7物品信息，并获取物品是不是采购件、制造件 var L7PartCodes = details.Select(p => p.L7Part).Distinct().ToList(); @@ -132,7 +132,7 @@ public class ProductL7PartsNoteManager : SfsStoreManagerBase p.ItemCode == noteDetail.ItemCode); if (productPlanDetail != null) @@ -64,7 +64,7 @@ public class ProductReceiptNoteManager : SfsStoreManagerBase new { p.ItemCode, p.RawLocationCode, p.Qty }) .Select(s => new BackFlushInventoryTotal { @@ -126,14 +126,14 @@ public class ProductReceiptNoteManager : SfsStoreManagerBase(); foreach (var productSumItem in productSumList) { var subBomList = totalBomList.Where(p => p.Product == productSumItem.ItemCode).ToList(); - //根据bom和父级零件总数获取子零件总数,然后将子零件总数汇总进 总零件数量 + //根据bom和父级物品总数获取子物品总数,然后将子物品总数汇总进 总物品数量 await GetSubBackFlushInventoryList(productSumItem, subBomList, subInventoryTotalList).ConfigureAwait(false); } @@ -183,7 +183,7 @@ public class ProductReceiptNoteManager : SfsStoreManagerBase - /// 根据bom和父级零件总数获取子零件总数,然后将子零件总数汇总进 总零件数量 + /// 根据bom和父级物品总数获取子物品总数,然后将子物品总数汇总进 总物品数量 /// /// /// @@ -195,7 +195,7 @@ public class ProductReceiptNoteManager : SfsStoreManagerBase p.ItemCode == subBom.Component && p.RawLocationCode == productSumItem.RawLocationCode && p.Qty == productSumItem.Qty); if (item == null) { - ////判断子零件是不是下线结算件，如果是就加入下线结算的列表；如果不是加入正常的回冲列表 + ////判断子物品是不是下线结算件，如果是就加入下线结算的列表；如果不是加入正常的回冲列表 //var itemBase = await _itemBasicAppService.GetByNameAsync(subBom.Component); item = new BackFlushInventoryTotal() diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductRecycleNotes/ProductRecycleMaterialDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductRecycleNotes/ProductRecycleMaterialDetail.cs index 746fba3f5..4999544e0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductRecycleNotes/ProductRecycleMaterialDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductRecycleNotes/ProductRecycleMaterialDetail.cs @@ -13,7 +13,7 @@ public class ProductRecycleMaterialDetail : SfsStoreDetailWithLotPackingQtyLocat public string ProductPackingCode { get; set; } /// - /// 产成品物料号 + /// 产成品ERP料号 /// public string ProductItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductRecycleNotes/ProductRecycleNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductRecycleNotes/ProductRecycleNoteManager.cs index b0d1105cc..73a15520b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductRecycleNotes/ProductRecycleNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/ProductRecycleNotes/ProductRecycleNoteManager.cs @@ -33,7 +33,7 @@ public class ProductRecycleNoteManager : SfsStoreManagerBase receiptL7PartsNoteDetails = new List(); @@ -41,7 +41,7 @@ public class ProductRecycleNoteManager : SfsStoreManagerBase stockMoveL7PartsNoteDetails = new List(); - //现根据零件号获取L7级零件的类型，并区分哪些是采购件哪些是制造件 + //现根据ERP料号获取L7级物品的类型，并区分哪些是采购件哪些是制造件 foreach (var detail in note.Details) { @@ -50,12 +50,12 @@ public class ProductRecycleNoteManager : SfsStoreManagerBase 0) { //构造并创建接口数据 @@ -98,10 +98,10 @@ public class ProductRecycleNoteManager : SfsStoreManagerBase 0) { - //TODO L7零件在WMS系统不做库存操作，下面的部分不应该执行 + //TODO L7物品在WMS系统不做库存操作，下面的部分不应该执行 var transactions = CreateTransactions(note, stockMoveL7PartsNoteDetails); await _transactionAppService.AddManyAsync(transactions); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteDetail.cs index 2d4164853..6f22299ca 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteDetail.cs @@ -47,7 +47,7 @@ public class TransferLibNoteDetail : SfsStoreDetailEntityBase #region 库存基础信息 /// - /// 物品代码 + /// ERP料号 /// public new string ItemCode { get; set; } @@ -425,7 +425,7 @@ public class TransferLibNoteDetail : SfsStoreDetailEntityBase public bool IsLotFrom { get; set; } public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteManager.cs index 6ba5d3e16..f675e203e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteManager.cs @@ -78,7 +78,7 @@ public class TransferLibNoteManager : SfsStoreManagerBase CreateAsync(UnplannedReceiptNote entity) { // 统一在TransactionManager中检查 - // foreach (UnplannedReceiptNoteDetail detail in entity.Details)//判断每个零件是否有对应关系 + // foreach (UnplannedReceiptNoteDetail detail in entity.Details)//判断每个物品是否有对应关系 // { // await _itemStoreRelationAppService.CheckByItemAndLocationAsync(detail.ItemCode, detail.LocationCode); // } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/WipWarehouseAdjustNote/WipWarehouseAdjustNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/WipWarehouseAdjustNote/WipWarehouseAdjustNoteManager.cs index ba26d8c9e..db194f967 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/WipWarehouseAdjustNote/WipWarehouseAdjustNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/WipWarehouseAdjustNote/WipWarehouseAdjustNoteManager.cs @@ -81,7 +81,7 @@ public class WipWarehouseAdjustNoteManager : SfsStoreManagerBase public string ItemDesc2 { get; set; } /// - /// 物品代码 + /// ERP料号 /// public string ItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlan.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlan.cs index e707eccec..a9af05214 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlan.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlan.cs @@ -59,9 +59,9 @@ public class CountPlan : SfsStoreRequestAggregateRootBase public DateTime PlanTime { get; set; } /// - /// 盘点的零件集合 + /// 盘点的物品集合 /// - [Display(Name = "盘点的零件集合")] + [Display(Name = "盘点的物品集合")] public string JsonItemCodes { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs index 55709757f..24bfe875e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs @@ -102,14 +102,14 @@ public class CountPlanManager : SfsStoreRequestManagerBase statusList) { - //根据条件 零件列表 + //根据条件 物品列表 List selectItemCodes = new List(); //根据条件 库位列表 List selectLocationCodes = new List(); //根据条件 库存状态列表 List selectStatusList = statusList; - //零件查询 + //物品查询 if (partCondition.Filters.Count > 0) { var itemInput = new SfsBaseDataRequestInputBase @@ -120,7 +120,7 @@ public class CountPlanManager : SfsStoreRequestManagerBase p.Code).Distinct().ToList(); } //库位查询 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/InjectioModelPlans/InjectioModelPlanManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/InjectioModelPlans/InjectioModelPlanManager.cs index cde55d028..05e6a6d89 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/InjectioModelPlans/InjectioModelPlanManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/InjectioModelPlans/InjectioModelPlanManager.cs @@ -362,7 +362,7 @@ public class InjectioModelPlanManager : SfsStoreRequestManagerBase(); - ////根据生产计划明细获取一层BOM信息，如果子零件为虚零件则下穿一层 + ////根据生产计划明细获取一层BOM信息，如果子物品为虚物品则下穿一层 //foreach (var productionPlanDetail in productionPlan.Details.Where(productionPlanDetail => // productionPlanDetail.PlanQty > 0)) //{ @@ -61,21 +61,21 @@ public class PreparationPlanManager : SfsStoreManagerBase p.Component); //foreach (var bomGroup in bomGroupByItemCode) //{ // var itemCode = bomGroup.Key; // var item = await ItemBasicAppService.GetByCodeAsync(itemCode).ConfigureAwait(false); - // Check.NotNull(item, "物品代码", $"物品 {itemCode} 不存在"); - // //成品零件号 + // Check.NotNull(item, "ERP料号", $"物品 {itemCode} 不存在"); + // //成品ERP料号 // var productItemCode = bomGroup.First().Product; // //取整方式 // var trunkType = bomGroup.First().TruncType; // //计量单位 // var uom = bomGroup.First().ComponentUom; - // //子零件的BOM用量为各个BOM用量的汇总 + // //子物品的BOM用量为各个BOM用量的汇总 // var bomGroupQty = bomGroup.Sum(p => p.ComponentQty); // //从生产计划明细中获得 // var planQty = productionPlan.Details.First(p => p.ItemCode == productItemCode).PlanQty; @@ -108,7 +108,7 @@ public class PreparationPlanManager : SfsStoreManagerBase GetFirstLocationFromItemStoreRelationAsync(string prodLine, string itemCode) { //在[Location]表，查询 LocationGroupCode = 生产线代码 （line1）得到LocationCode清单 - //在[ItemStoreRelation] 查询 LocationCode 在上面查到的范围的数据，得到零件和LocationCode对应关系 + //在[ItemStoreRelation] 查询 LocationCode 在上面查到的范围的数据，得到物品和LocationCode对应关系 var locationGroupCodes = new List { prodLine }; var locations = await LocationAppService.GetListByGroupsAsync(locationGroupCodes).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/ProductionPlans/ProductionPlanManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/ProductionPlans/ProductionPlanManager.cs index fcab83b88..d5d394a3e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/ProductionPlans/ProductionPlanManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/ProductionPlans/ProductionPlanManager.cs @@ -362,7 +362,7 @@ public class ProductionPlanManager : SfsStoreRequestManagerBase - /// 目标物品代码 + /// 目标ERP料号 /// public string ToItemCode { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ProductReceiptRequests/ProductReceiptRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ProductReceiptRequests/ProductReceiptRequestManager.cs index d57e6ccf6..04d527364 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ProductReceiptRequests/ProductReceiptRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ProductReceiptRequests/ProductReceiptRequestManager.cs @@ -314,7 +314,7 @@ public class ProductReceiptRequestManager : SfsStoreRequestManagerBase p.Code == detail.ItemCode); - Check.NotNull(item, "物品代码", $"物品 {detail.ItemCode} 不存在"); + Check.NotNull(item, "ERP料号", $"物品 {detail.ItemCode} 不存在"); detail.ItemName = item?.Name; detail.ItemDesc1 = item?.Desc1; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ScrapRequests/ScrapRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ScrapRequests/ScrapRequestManager.cs index 41f911569..6716b98da 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ScrapRequests/ScrapRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/ScrapRequests/ScrapRequestManager.cs @@ -45,7 +45,7 @@ public class ScrapRequestManager : SfsStoreRequestManagerBase - /// 物品代码 + /// ERP料号 /// public new string ItemCode { get; set; } @@ -293,7 +293,7 @@ public class TransferLibRequestDetail : SfsStoreDetailEntityBase public bool IsLotTo { get; set; } - //零件号 + //ERP料号 public bool IsItemCodeFrom { get; set; } public bool IsItemCodeTo { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequestManager.cs index b7a3ab95c..545b14c98 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequestManager.cs @@ -40,7 +40,7 @@ public class TransferLibRequestManager : SfsStoreRequestManagerBase p.BoxQty); //获取生产线 var productionLineDto = await _productionLineAppService @@ -143,7 +143,7 @@ public class InjectionPlanRequestEventHandler if (productLineCodeAndItemCode == null) { throw new UserFriendlyException( - $"物品代码【{inputDetailTemplate.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); + $"ERP料号【{inputDetailTemplate.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); } //获取可用库存 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs index 545a2c606..5e47d6226 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs @@ -336,9 +336,9 @@ public class AssembleIssueRequestEventHandler foreach (var detail in assembleIssueRequestDetailList) { - //当前零件的集合 + //当前物品的集合 var inputDetails = assembleIssueRequestDetailList; - //获取请求下 这个零件和这个库位一个需要多少箱 + //获取请求下 这个物品和这个库位一个需要多少箱 var sumBoxQty = inputDetails.Sum(p => p.BoxQty - jobs.Count); //获取生产线 var productionLineDto = await _productionLineAppService @@ -350,7 +350,7 @@ public class AssembleIssueRequestEventHandler if (productLineCodeAndItemCode == null) { throw new UserFriendlyException( - $"物品代码【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); + $"ERP料号【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); } //可用库存 @@ -512,7 +512,7 @@ public class AssembleIssueRequestEventHandler } //原料 - if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.RawLocationCodeListJson); @@ -547,7 +547,7 @@ public class AssembleIssueRequestEventHandler } //半成品 - if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.ProductLocationCodeListJson); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs index 4da179fbc..971bc0158 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs @@ -336,9 +336,9 @@ public class CoatingIssueRequestEventHandler foreach (var detail in coatingIssueRequestDetailList) { - //当前零件的集合 + //当前物品的集合 var inputDetails = coatingIssueRequestDetailList; - //获取请求下 这个零件和这个库位一个需要多少箱 + //获取请求下 这个物品和这个库位一个需要多少箱 var sumBoxQty = inputDetails.Sum(p => p.BoxQty - jobs.Count); //获取生产线 var productionLineDto = await _productionLineAppService @@ -350,7 +350,7 @@ public class CoatingIssueRequestEventHandler if (productLineCodeAndItemCode == null) { throw new UserFriendlyException( - $"物品代码【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); + $"ERP料号【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); } //可用库存 @@ -512,7 +512,7 @@ public class CoatingIssueRequestEventHandler } //原料 - if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.RawLocationCodeListJson); @@ -547,7 +547,7 @@ public class CoatingIssueRequestEventHandler } //半成品 - if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.ProductLocationCodeListJson); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs index cbfae557b..e72ebb222 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs @@ -336,9 +336,9 @@ public class InjectionIssueRequestEventHandler foreach (var detail in injectionIssueRequestDetailList) { - //当前零件的集合 + //当前物品的集合 var inputDetails = injectionIssueRequestDetailList; - //获取请求下 这个零件和这个库位一个需要多少箱 + //获取请求下 这个物品和这个库位一个需要多少箱 var sumBoxQty = inputDetails.Sum(p => p.BoxQty - jobs.Count); //获取生产线 var productionLineDto = await _productionLineAppService @@ -350,7 +350,7 @@ public class InjectionIssueRequestEventHandler if (productLineCodeAndItemCode == null) { throw new UserFriendlyException( - $"物品代码【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); + $"ERP料号【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); } //可用库存 @@ -512,7 +512,7 @@ public class InjectionIssueRequestEventHandler } //原料 - if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.RawLocationCodeListJson); @@ -547,7 +547,7 @@ public class InjectionIssueRequestEventHandler } //半成品 - if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.ProductLocationCodeListJson); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs index a7e7fa77a..74ca3e3fd 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs @@ -335,9 +335,9 @@ public class KittingIssueRequestEventHandler foreach (var detail in kittingIssueRequestDetailList) { - //当前零件的集合 + //当前物品的集合 var inputDetails = kittingIssueRequestDetailList; - //获取请求下 这个零件和这个库位一个需要多少箱 + //获取请求下 这个物品和这个库位一个需要多少箱 var sumBoxQty = inputDetails.Sum(p => p.BoxQty - jobs.Count); //获取生产线 var productionLineDto = await _productionLineAppService @@ -349,7 +349,7 @@ public class KittingIssueRequestEventHandler if (productLineCodeAndItemCode == null) { throw new UserFriendlyException( - $"物品代码【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); + $"ERP料号【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); } //可用库存 @@ -510,7 +510,7 @@ public class KittingIssueRequestEventHandler } //原料 - if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.RawLocationCodeListJson); @@ -545,7 +545,7 @@ public class KittingIssueRequestEventHandler } //半成品 - if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.ProductLocationCodeListJson); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs index 3196a5aea..4ccdaed8a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs @@ -335,9 +335,9 @@ public class SparePartIssueRequestEventHandler foreach (var detail in sparePartIssueRequestDetailList) { - //当前零件的集合 + //当前物品的集合 var inputDetails = sparePartIssueRequestDetailList; - //获取请求下 这个零件和这个库位一个需要多少箱 + //获取请求下 这个物品和这个库位一个需要多少箱 var sumBoxQty = inputDetails.Sum(p => p.BoxQty - jobs.Count); //获取生产线 var productionLineDto = await _productionLineAppService @@ -349,7 +349,7 @@ public class SparePartIssueRequestEventHandler if (productLineCodeAndItemCode == null) { throw new UserFriendlyException( - $"物品代码【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); + $"ERP料号【{detail.ItemCode}】在生产线【{productionLineDto.Code}】中没有对应的【生产线物品关系】"); } //可用库存 @@ -510,7 +510,7 @@ public class SparePartIssueRequestEventHandler } //原料 - if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.RawLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.RawLocationCodeListJson); @@ -545,7 +545,7 @@ public class SparePartIssueRequestEventHandler } //半成品 - if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个零件 要不是原料 要不是半成品 + if (!string.IsNullOrEmpty(productionLineItemDto.ProductLocationCodeListJson)) //因为一个物品 要不是原料 要不是半成品 { var usableLocationCode = JsonSerializer.Deserialize>(productionLineItemDto.ProductLocationCodeListJson); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ProductRecycleRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ProductRecycleRequestEventHandler.cs index 8631f3045..757466abe 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ProductRecycleRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ProductRecycleRequestEventHandler.cs @@ -351,7 +351,7 @@ public class ProductRecycleRequestEventHandler detailInput.ItemCode = bom.Component; var item = await _itemBasicApp.GetByCodeAsync(bom.Component); - Check.NotNull(item, "物品代码", $"物品 {bom.Component} 不存在"); + Check.NotNull(item, "ERP料号", $"物品 {bom.Component} 不存在"); if (item != null) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ScrapRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ScrapRequestEventHandler.cs index 4f75f7e83..ae0053432 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ScrapRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/ScrapRequestEventHandler.cs @@ -91,7 +91,7 @@ public class ScrapRequestEventHandler if (balance.Qty < detail.Qty) { - throw new UserFriendlyException($"物料号 {detail.ItemCode} 库存余额 {balance.Qty} 小于 {detail.Qty}。"); + throw new UserFriendlyException($"ERP料号 {detail.ItemCode} 库存余额 {balance.Qty} 小于 {detail.Qty}。"); } var inputDetail = ObjectMapper.Map(balance); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs index 8c2f4e001..cf55ad3f9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/BackFlushNoteEventHandler.cs @@ -73,7 +73,7 @@ public class BackFlushNoteEventHandler var docNumber = string.Empty; foreach (var transactionEditInput in sameList) { - docNumber += "----【单据号】" + transactionEditInput.DocNumber + "【物料代码】" + transactionEditInput.ItemCode + "【数量】" + transactionEditInput.Qty + " 】 "; + docNumber += "----【单据号】" + transactionEditInput.DocNumber + "【ERP料号】" + transactionEditInput.ItemCode + "【数量】" + transactionEditInput.Qty + " 】 "; } variableTransactionEditInput.Remark = docNumber; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/KittingPackagingNoteHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/KittingPackagingNoteHandler.cs index d3f34885b..c0f25f0a6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/KittingPackagingNoteHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/KittingPackagingNoteHandler.cs @@ -64,7 +64,7 @@ public class KittingPackagingNoteEventHandler private async Task> BuildTransferLogsAsync(KittingPackagingNote kittingPackagingNote) { var transferLogCreateInputs = new List(); - //获取生产线和 生产线零件关系 用来下面找装配的线边做查询 + //获取生产线和 生产线物品关系 用来下面找装配的线边做查询 var productionLineList = await _productionLineAppService.GetByLocationCodeAsync(EnumProductionLineType.Assemble) .ConfigureAwait(false); var productionItemList = new List(); @@ -88,13 +88,13 @@ public class KittingPackagingNoteEventHandler { var strProductionLine = string.Empty; productionLineList.ForEach(dto => strProductionLine += dto.Code+ ","); - throw new UserFriendlyException($"没有在 【生产线零件】中找到 生产线代码【{strProductionLine.Remove(strProductionLine.Length-1)}】物料代码【{detail.ItemCode}】的配置"); + throw new UserFriendlyException($"没有在 【生产线物品】中找到 生产线代码【{strProductionLine.Remove(strProductionLine.Length-1)}】ERP料号【{detail.ItemCode}】的配置"); } var list = JsonSerializer.Deserialize>(productionLineItemDtos.WipLocationCodeListJson); if (list == null || list.Count < 1) { - throw new UserFriendlyException($"没有在 【生产线零件】中 生产线代码【{productionLineItemDtos.ProdLineCode}】物料代码【{detail.ItemCode}】中配置线边库位"); + throw new UserFriendlyException($"没有在 【生产线物品】中 生产线代码【{productionLineItemDtos.ProdLineCode}】ERP料号【{detail.ItemCode}】中配置线边库位"); } var assembleFirstLocationCode = list.First(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ProductReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ProductReceiptNoteEventHandler.cs index e512d86ce..74dab4040 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ProductReceiptNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/ProductReceiptNoteEventHandler.cs @@ -87,7 +87,7 @@ public class ProductReceiptNoteEventHandler var docNumber = string.Empty; foreach (var transactionEditInput in sameList) { - docNumber += "----【单据号】" + transactionEditInput.DocNumber + "【物料代码】" + transactionEditInput.ItemCode + "【数量】" + transactionEditInput.Qty + " 】 "; + docNumber += "----【单据号】" + transactionEditInput.DocNumber + "【ERP料号】" + transactionEditInput.ItemCode + "【数量】" + transactionEditInput.Qty + " 】 "; } variableTransactionEditInput.Remark = docNumber; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs index c0cdb0ae5..23f34ecf2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReceiptNoteEventHandler.cs @@ -240,7 +240,7 @@ public class PurchaseReceiptNoteEventHandler } /// - /// 构造零件与质检规则的字典 + /// 构造物品与质检规则的字典 /// /// /// @@ -250,7 +250,7 @@ public class PurchaseReceiptNoteEventHandler var dictionary = new Dictionary(); - //所有零件的分组 + //所有物品的分组 var itemCodeGroup = entity.Details.GroupBy(p => p.ItemCode); foreach (var groupItem in itemCodeGroup) @@ -285,7 +285,7 @@ public class PurchaseReceiptNoteEventHandler createInput.AutoSubmit = true; createInput.DirectCreateNote = false; - //汇总取出所有 合格物品的物品代码集合 + //汇总取出所有 合格物品的ERP料号集合 var itemCodeSummaryList = createInput.Details.Select(p => p.ItemCode).Distinct().ToList(); foreach (var itemCodeSummary in itemCodeSummaryList) @@ -341,7 +341,7 @@ public class PurchaseReceiptNoteEventHandler decimal sumCount) { var item = await ItemBasicAclService.GetByCodeAsync(template.ItemCode).ConfigureAwait(false); - Check.NotNull(item, "物品代码", $"物品 {template.ItemCode} 不存在"); + Check.NotNull(item, "ERP料号", $"物品 {template.ItemCode} 不存在"); //构造汇总 var inspectRequestSummaryDetailInput = new InspectRequestSummaryDetailInput