Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/Product.cs

@@ -12,15 +12,15 @@ public class Product : Entity
     /// </summary>
     public string ERP { get; set; }
     /// <summary>
-    /// 零件号
+    /// ERP料号
     /// </summary>
     public string Code { get; set; }
     /// <summary>
-    /// 零件名
+    /// 物品名
     /// </summary>
     public string Name { get; set; }
     /// <summary>
-    /// 零件规格/颜色
+    /// 物品规格/颜色
     /// </summary>
     public string Model { get; set; }
     /// <summary>

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Issue/IssueNote.cs

@@ -15,7 +15,7 @@ public class IssueNote : Entity
     /// </summary>
     public string DeliverNumber { get; set; }
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public string ItemCode { get; set; }
     /// <summary>

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
 {
     /// <summary>
-    /// 父物料号
+    /// 父ERP料号
     /// </summary>
     public string mes_bom_assy { get; set; }
     /// <summary>
-    /// 子物料号
+    /// 子ERP料号
     /// </summary>
     public string mes_bom_part { get; set; }
     /// <summary>

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ErpLocationItems/locdout.cs

@@ -13,7 +13,7 @@ public class locdout : Entity
     /// </summary>
     public string locdout_loc { get; set; }
     /// <summary>
-    /// 零件
+    /// 物品
     /// </summary>
     public string locdout_part { get; set; }
    

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
 {
     /// <summary>
-    /// 物料代码
+    /// ERP料号
     /// </summary>
     public string ismout_part { get; set; }
 

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
 {
     /// <summary>
-    /// 物料代码
+    /// ERP料号
     /// </summary>
     public string spriceout_part { get; set; }
 

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scmsend.cs

@@ -21,7 +21,7 @@ public class Scmsend : Entity<long>
     /// </summary>
     public string scmsend_stat1 { get; set; }
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public string scmsend_part { get; set; }
     /// <summary>

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs

@@ -35,7 +35,7 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
             return;
         }
 
-        Logger.LogInformation($"Read Plan");
+        Logger.LogInformation($"读取 采购订单");
         var planReader = workerContext.ServiceProvider.GetRequiredService<PlanReader>();
         var planConverter = workerContext.ServiceProvider.GetRequiredService<PlanConverter>();
         //读取并保存Plan
@@ -43,7 +43,7 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //转换Plan
         await planConverter.ConvertAsync(plansFromExternalList).ConfigureAwait(false);
 
-        Logger.LogInformation($"Read Ship");
+        Logger.LogInformation($"读取 发货单");
         var shipHandleService = workerContext.ServiceProvider.GetRequiredService<ShipReader>();
         var shipConverter = workerContext.ServiceProvider.GetRequiredService<ShipConverter>();
         //读取并保持Ship
@@ -51,7 +51,7 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //转换Ship
         await shipConverter.ConvertAsync(shipsFromExternalList).ConfigureAwait(false);
 
-        Logger.LogInformation($"Read Product");
+        Logger.LogInformation($"读取 产品");
         var productHandleService = workerContext.ServiceProvider.GetRequiredService<ProductReader>();
         var productConverter = workerContext.ServiceProvider.GetRequiredService<ProductConverter>();
         //读取并保持Product

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs

@@ -35,13 +35,13 @@ public class EosOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
             return;
         }
 
-        Logger.LogInformation($"Write Arrive");
+        Logger.LogInformation($"传出 采购上架单");
         var arriveConvert = workerContext.ServiceProvider.GetRequiredService<ArriveConverter>();
         var arriveNoteList = await arriveConvert.ConvertAsync().ConfigureAwait(false);
         var arriveWriter = workerContext.ServiceProvider.GetRequiredService<ArriveNoteWriter>();
         await arriveWriter.WriteAsync(arriveNoteList).ConfigureAwait(false);
 
-        Logger.LogInformation($"Write Return");
+        Logger.LogInformation($"传出 采购退货单");
         var returnConvert = workerContext.ServiceProvider.GetRequiredService<ReturnConverter>();
         var returnNoteList = await returnConvert.ConvertAsync().ConfigureAwait(false);
         var returnWriter = workerContext.ServiceProvider.GetRequiredService<ReturnNoteWriter>();

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; }
 
         /// <summary>
-        /// 零件号
+        /// ERP料号
         /// </summary>
         [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; }
 
         /// <summary>
-        /// 零件号
+        /// ERP料号
         /// </summary>
         [Newtonsoft.Json.JsonProperty("partCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string PartCode { get; set; }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs

@@ -124,7 +124,7 @@ public class InjectionMoldingRequestReader : IReader
             _logger.LogInformation(MakeGrid($"标识{guid}读取{invterval}次接口表",camralist1));
             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();
@@ -153,7 +153,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() }
@@ -199,7 +199,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)
                     {
@@ -267,22 +267,22 @@ public class InjectionMoldingRequestReader : IReader
 
 
     /// <summary>
-    /// 绑定零件库位信息，如果对错误返回错误新列表
+    /// 绑定物品库位信息，如果对错误返回错误新列表
     /// </summary>
     /// <param name="p_list"></param>
     /// <returns></returns>
     private async Task<List<string>> BindAsync(List<InjectionIssueRequestDetailInput> p_list)
     {
-        // 异步方法，将输入的请求绑定到对应的零件和库位信息，返回错误列表
+        // 异步方法，将输入的请求绑定到对应的物品和库位信息，返回错误列表
         List<string> errors = new List<string>();
         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;
@@ -366,11 +366,11 @@ public class InjectionMoldingRequestReader : IReader
     public class InjectionRequest
     {
         /// <summary>
-        /// 零件M
+        /// 物品M
         /// </summary>
         public string ItemCode { get; set; }
         /// <summary>
-        /// 零件名称
+        /// 物品名称
         /// </summary>
         public string ItemName { get; set; }
         /// <summary>

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<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(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<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(detail);

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs

@@ -108,7 +108,7 @@ public class MesOutConverter : IIncomingConverter
                     wmsProductReceiptNoteDetail.Lot = ""; //排序批次
                     wmsProductReceiptNoteDetail.PackingCode = "";//箱标签
                     wmsProductReceiptNoteDetail.Status = EnumInventoryStatus.OK;
-                    wmsProductReceiptNoteDetail.WarehouseCode = "T8";
+                    wmsProductReceiptNoteDetail.WarehouseCode = "T9";
                     wmsProductReceiptNoteDetail.LocationArea = "";
                     wmsProductReceiptNoteDetail.LocationGroup = "";
                     if (wmsProductReceiptNoteDetail.MesQuality=="1")//质量补
@@ -153,7 +153,7 @@ public class MesOutConverter : IIncomingConverter
                     }
                     else
                     {
-                        //todo 这里不应该做完工 没有零件
+                        //todo 这里不应该做完工 没有物品
                         wmsProductReceiptNoteDetail.ItemName = "";
                         wmsProductReceiptNoteDetail.ItemDesc1 = "";
                         wmsProductReceiptNoteDetail.ItemDesc2 = "";

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))
                 {

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<ItemBasicReader>();
                 var itemBasicConverter = workerContext.ServiceProvider.GetRequiredService<ItemBasicConverter>();
                 //读取并保存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<ErpLocationItemReader>();
                 var ErpLocationItemConverter = workerContext.ServiceProvider.GetRequiredService<ErpLocationItemConverter>();
                 //读取并保存ErpLocationItem

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<ProductReceiptNoteDTO>(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;

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,

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs

@@ -172,7 +172,7 @@ public class TyrpAgentModule : AbpModule
         ApplicationInitializationContext context)
     {
 
-       // context.AddBackgroundWorkerAsync<TyrpIncomingBackgroundWorker>();
+        context.AddBackgroundWorkerAsync<TyrpIncomingBackgroundWorker>();
         context.AddBackgroundWorkerAsync<TyrpOutgoingBackgroundWorker>();
     }
 

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/appsettings.json

@@ -3,7 +3,7 @@
     "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
     "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
     "TYRP": "Server=dev.ccwin-in.com,13319;Database=TYRP_CC;Uid=ccwin-in;Pwd=Microsoft@2022;TrustServerCertificate=True",
-    "SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1
+    "SYBASE_TYRP": "Data Source=10.164.233.4; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1
   },
 
   "AuthServer": {

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; }
 
     /// <summary>
-    /// L7零件号
+    /// L7ERP料号
     /// </summary>
-    [Display(Name = "L7零件号")]
+    [Display(Name = "L7ERP料号")]
     public string L7Part { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// L7零件
+    /// L7物品
     /// </summary>
-    [Display(Name = "L7零件")]
+    [Display(Name = "L7物品")]
     public string L7Part { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// 物料号(Part number)(Part number)
+    /// ERP料号(Part number)(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part number)(Part number)
+    /// ERP料号(Part number)(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     [Required]
     public virtual string PartCode { get; set; }

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; }
 
     /// <summary>
-    /// 父物料号(Parent part number)
+    /// 父ERP料号(Parent part number)
     /// </summary>
-    [Display(Name = "父物料号(Parent part number)")]
+    [Display(Name = "父ERP料号(Parent part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string ParentCode { get; set; }
 
     /// <summary>
-    /// 子物料号(Component part number)
+    /// 子ERP料号(Component part number)
     /// </summary>
-    [Display(Name = "子物料号(Component part number)")]
+    [Display(Name = "子ERP料号(Component part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string ComponentCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 父物料号(Parent part number)
+    /// 父ERP料号(Parent part number)
     /// </summary>
-    [Display(Name = "父物料号(Parent part number)")]
+    [Display(Name = "父ERP料号(Parent part number)")]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     [Required]
     public virtual string ParentCode { get; set; }
 
     /// <summary>
-    /// 子物料号(Component part number)
+    /// 子ERP料号(Component part number)
     /// </summary>
-    [Display(Name = "子物料号(Component part number)")]
+    [Display(Name = "子ERP料号(Component part number)")]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     [Required]
     public virtual string ComponentCode { get; set; }

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }
 
     /// <summary>
-    /// 客户物料号(Customer part number)
+    /// 客户ERP料号(Customer part number)
     /// </summary>
-    [Display(Name = "客户物料号(Customer part number)")]
+    [Display(Name = "客户ERP料号(Customer part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string CustPartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }
 
     /// <summary>
-    /// 客户物料号(Customer part number)
+    /// 客户ERP料号(Customer part number)
     /// </summary>
-    [Display(Name = "客户物料号(Customer part number)")]
+    [Display(Name = "客户ERP料号(Customer part number)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.AddressLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string CustPartCode { get; set; }

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string Part { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string Part { get; set; }

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [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; }
 
     /// <summary>
-    /// 零件类型(Part type)
+    /// 物品类型(Part type)
     /// </summary>
-    [Display(Name = "零件类型(Part type)")]
+    [Display(Name = "物品类型(Part type)")]
     [StringLength(200, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartType { get; set; }
 
     /// <summary>
-    /// 零件种类(Part catalog)
+    /// 物品种类(Part catalog)
     /// </summary>
-    [Display(Name = "零件种类(Part catalog)")]
+    [Display(Name = "物品种类(Part catalog)")]
     [StringLength(200, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCatalog { get; set; }
 
     /// <summary>
-    /// 零件分组(Part group)
+    /// 物品分组(Part group)
     /// </summary>
-    [Display(Name = "零件分组(Part group)")]
+    [Display(Name = "物品分组(Part group)")]
     [StringLength(200, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartGroup { get; set; }
 
     /// <summary>
-    /// 虚零件
+    /// 虚物品
     /// </summary>
-    [Display(Name = "虚零件(Is phantom)")]
+    [Display(Name = "虚物品(Is phantom)")]
     public virtual bool IsPhantom { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [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; }
 
     /// <summary>
-    /// 零件类型(Part type)
+    /// 物品类型(Part type)
     /// </summary>
-    [Display(Name = "零件类型(Part type)")]
+    [Display(Name = "物品类型(Part type)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.ShortCodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartType { get; set; }
 
     /// <summary>
-    /// 零件种类(Part catalog)
+    /// 物品种类(Part catalog)
     /// </summary>
-    [Display(Name = "零件种类(Part catalog)")]
+    [Display(Name = "物品种类(Part catalog)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.ShortCodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCatalog { get; set; }
 
     /// <summary>
-    /// 零件分组(Part group)
+    /// 物品分组(Part group)
     /// </summary>
-    [Display(Name = "零件分组(Part group)")]
+    [Display(Name = "物品分组(Part group)")]
     [StringLength(SfsEfCorePropertyConst.ShortCodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartGroup { get; set; }
 
     /// <summary>
-    /// 虚零件
+    /// 虚物品
     /// </summary>
-    [Display(Name = "虚零件(Is phantom)")]
+    [Display(Name = "虚物品(Is phantom)")]
     public virtual bool IsPhantom { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }

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; }
 
     /// <summary>
-    /// 零件号
+    /// ERP料号
     /// </summary>
-    [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; }

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; }
 
     /// <summary>
-    /// 零件号
+    /// ERP料号
     /// </summary>
-    [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; }

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string Part { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.AddressLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string Part { get; set; }

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; }
 
     /// <summary>
-    /// 物料号(Part code)
+    /// ERP料号(Part code)
     /// </summary>
-    [Display(Name = "物料号(Part code)")]
+    [Display(Name = "ERP料号(Part code)")]
     public virtual string PartCode { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// 物料号(Part code)
+    /// ERP料号(Part code)
     /// </summary>
-    [Display(Name = "物料号(Part code)")]
+    [Display(Name = "ERP料号(Part code)")]
     [Required]
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part code)
+    /// ERP料号(Part code)
     /// </summary>
-    [Display(Name = "物料号(Part code)")]
+    [Display(Name = "ERP料号(Part code)")]
     public virtual string PartCode { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// 物料号(Part code)
+    /// ERP料号(Part code)
     /// </summary>
-    [Display(Name = "物料号(Part code)")]
+    [Display(Name = "ERP料号(Part code)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }
 
     /// <summary>
-    /// 供应商物料号(Vendor part number)
+    /// 供应商ERP料号(Vendor part number)
     /// </summary>
-    [Display(Name = "供应商物料号(Vendor part number)")]
+    [Display(Name = "供应商ERP料号(Vendor part number)")]
     [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string VendPartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号(Part number)
+    /// ERP料号(Part number)
     /// </summary>
-    [Display(Name = "物料号(Part number)")]
+    [Display(Name = "ERP料号(Part number)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.QtyLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string PartCode { get; set; }
 
     /// <summary>
-    /// 供应商物料号(Vendor part number)
+    /// 供应商ERP料号(Vendor part number)
     /// </summary>
-    [Display(Name = "供应商物料号(Vendor part number)")]
+    [Display(Name = "供应商ERP料号(Vendor part number)")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.AddressLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public virtual string VendPartCode { get; set; }

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);
     }
 

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;

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);
 

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;
 
 /// <summary>
-/// MesL7级零件对照关系
+/// MesL7级物品对照关系
 /// </summary>
 public class MesProductL7PartsNote : SfsAggregateRootBase
 
@@ -52,7 +52,7 @@ public class MesProductL7PartsNote : SfsAggregateRootBase
     public string Configuration { get; set; }
 
     /// <summary>
-    /// L7零件号
+    /// L7ERP料号
     /// </summary>
     public string L7Part { get; set; }
 

be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNoteManager.cs

@@ -25,7 +25,7 @@ public class MesProductL7PartsNoteManager : DomainService, IMesProductL7PartsNot
     ///// <returns></returns>
     //public virtual async Task CreateAsync(List<MesProductL7PartsNote> mesNotes)
     //{
-    //    //保存相关L7级零件单据
+    //    //保存相关L7级物品单据
     //    await _repository.InsertManyAsync(mesNotes);
     //}
 
@@ -36,7 +36,7 @@ public class MesProductL7PartsNoteManager : DomainService, IMesProductL7PartsNot
     /// <returns></returns>
     public async Task<int> GetMaxRowIdAsync()
     {
-        //保存相关L7级零件单据
+        //保存相关L7级物品单据
         return await _repository.MaxAsync(p => p.RowID).ConfigureAwait(false);
         ;
     }

be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/asn_mstrs/AsnDet.cs

@@ -30,7 +30,7 @@ public class AsnDet : CreationAuditedEntity<Guid>
     public virtual int PoLine { get; set; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 父物料号
+    /// 父ERP料号
     /// </summary>
     public virtual string Parent { get; set; }
 
     /// <summary>
-    /// 子物料号
+    /// 子ERP料号
     /// </summary>
     public virtual string Component { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string PartCode { get; set; }
 
     /// <summary>
-    /// 客户物料号
+    /// 客户ERP料号
     /// </summary>
     public virtual string CustPartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string Part { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string Code { get; set; }
 
@@ -71,22 +71,22 @@ public class Part : EntityBase
     public virtual string ProdKind { get; set; }
 
     /// <summary>
-    /// 零件类型
+    /// 物品类型
     /// </summary>
     public virtual string PartType { get; set; }
 
     /// <summary>
-    /// 零件种类
+    /// 物品种类
     /// </summary>
     public virtual string PartCatalog { get; set; }
 
     /// <summary>
-    /// 零件分组
+    /// 物品分组
     /// </summary>
     public virtual string PartGroup { get; set; }
 
     /// <summary>
-    /// 虚零件
+    /// 虚物品
     /// </summary>
     public virtual bool IsPhantom { get; set; }
 

be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/po_mstrs/PoDet.cs

@@ -24,7 +24,7 @@ public class PoDet : CreationAuditedEntity<Guid>
     public virtual int PoLine { get; set; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 零件号
+    /// ERP料号
     /// </summary>
     public string Part { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string Part { get; set; }
 

be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/receipts/ReceiptDet.cs

@@ -21,7 +21,7 @@ public class ReceiptDet : CreationAuditedEntity<Guid>
     public virtual int PoLine { get; set; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string PartCode { get; set; }
 

be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/returns/ReturnDet.cs

@@ -21,7 +21,7 @@ public class ReturnDet : CreationAuditedEntity<Guid>
     public virtual int PoLine { get; set; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string PartCode { get; set; }
 

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; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
     public virtual string PartCode { get; set; }
 
     /// <summary>
-    /// 供应商物料号
+    /// 供应商ERP料号
     /// </summary>
     public virtual string VendPartCode { get; set; }
 

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs

@@ -150,6 +150,6 @@ public class AgentModule : AbpModule
              ApplicationInitializationContext context)
     {
         context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
-        context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
+       // context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
     }
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json

@@ -3,6 +3,9 @@
     "WSL": {
       "commandName": "WSL2",
       "distributionName": ""
+    },
+    "Win_in.Sfs.Wms.DataExchange.Agent": {
+      "commandName": "Project"
     }
   }
 }

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
     /// <summary>
     /// ERP库位

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; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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
 {
     /// <summary>
-    /// 父物料号
+    /// 父ERP料号
     /// </summary>
-    [Display(Name = "父物料号")]
+    [Display(Name = "父ERP料号")]
     [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string Product { get; set; }
 
     /// <summary>
-    /// 子物料号
+    /// 子ERP料号
     /// </summary>
-    [Display(Name = "子物料号")]
+    [Display(Name = "子ERP料号")]
     [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string Component { get; set; }
     /// <summary>

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
 {
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
     /// <summary>
     /// ERP库位

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; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 }

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
     /// <summary>
     /// 来源ERP库位

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
     /// <summary>
     /// 来源库区

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; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     [Required(ErrorMessage = "{0}是必填项")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ItemCode { get; set; }

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; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     [Required(ErrorMessage = "{0}是必填项")]
     public string ItemCode { get; set; }

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>
@@ -27,10 +27,10 @@ public class ItemPackExchangeDto
     [Display(Name = "包装名称")]
     public string PackName { get; set; }
     /// <summary>
-    /// 零件规格/颜色
+    /// 物品规格/颜色
     /// </summary>
 
-    [Display(Name = "零件规格/颜色")]
+    [Display(Name = "物品规格/颜色")]
     public string Remark { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     [Required(ErrorMessage = "{0}是必填项")]
     public string ItemCode { get; set; }

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     [Required(ErrorMessage = "{0}是必填项")]
     public string ItemCode { get; set; }

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
 {
     /// <summary>
-    /// 零件编号
+    /// 物品编号
     /// </summary>
-    [Display(Name = "零件编号")]
+    [Display(Name = "物品编号")]
     public string itemCode { get; set; }
     /// <summary>
     /// 库位编码
     /// </summary>
-    [Display(Name = "零件编号")]
+    [Display(Name = "物品编号")]
     public string locationCode { get; set; }
 
     /// <summary>

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
 {
     /// <summary>
-    /// 产成品物料号
+    /// 产成品ERP料号
     /// </summary>
-    [Display(Name = "产成品物料号")]
+    [Display(Name = "产成品ERP料号")]
     public string ProductItemCode { get; set; }
 
     /// <summary>
@@ -23,9 +23,9 @@ public class ProductRecycleMaterialDetailExchangeDto
     public string LocationErpCode { get; set; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
 

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;
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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
 {  
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
 
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ItemCode { get; set; }

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;
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     [Display(Name = "备注")]

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;
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     [Display(Name = "备注")]

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
     /// <summary>
     /// Erp储位

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
 {
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
 
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ItemCode { get; set; }

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; }
 
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     [Required(ErrorMessage = "{0}是必填项")]
     public string ItemCode { get; set; }

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
 {
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
 
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     [Required]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ItemCode { get; set; }

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;
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>
@@ -140,14 +140,14 @@ public class SupplierAsnDetailExchangeDto
     public string Remark { get; set; }
 
     /// <summary>
-    /// 供应商零件号
+    /// 供应商ERP料号
     /// </summary>
-    [Display(Name = "供应商零件号")]
+    [Display(Name = "供应商ERP料号")]
     public string SupplierItemCode { get; set; }
 
     /// <summary>
-    /// 供应商零件名
+    /// 供应商物品名
     /// </summary>
-    [Display(Name = "供应商零件名")]
+    [Display(Name = "供应商物品名")]
     public string SupplierItemName { get; set; }
 }

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; }
 
     /// <summary>
-    /// 物料号
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物料号")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>
-    /// 物料号名称
+    /// ERP料号名称
     /// </summary>
-    [Display(Name = "物料号名称")]
+    [Display(Name = "ERP料号名称")]
     public string ItemName { get; set; }
 
     /// <summary>
-    /// 供应商物料号
+    /// 供应商ERP料号
     /// </summary>
-    [Display(Name = "供应商物料号")]
+    [Display(Name = "供应商ERP料号")]
     public string SupplierItemCode { get; set; }
 
     /// <summary>

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
 
     /// <summary>

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
     /// <summary>
     /// 来源ERP库位

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; }
     /// <summary>
-    /// 物品代码
+    /// ERP料号
     /// </summary>
-    [Display(Name = "物品代码")]
+    [Display(Name = "ERP料号")]
     public string ItemCode { get; set; }
     /// <summary>
     /// 来源ERP库位

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

@@ -328,7 +328,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote.BackFlushNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote.BackFlushNoteDetailExchangeDto.LocationErpCode">
@@ -353,7 +353,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote.BackFlushNoteExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote.BackFlushNoteExchangeDto.LocationErpCode">
@@ -373,12 +373,12 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.Bom.BomExchangeDto.Product">
             <summary>
-            父物料号
+            父ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.Bom.BomExchangeDto.Component">
             <summary>
-            子物料号
+            子ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.Bom.BomExchangeDto.ComponentQty">
@@ -398,7 +398,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.CountAdjustNote.CountAdjustNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.CountAdjustNote.CountAdjustNoteDetailExchangeDto.LocationErpCode">
@@ -473,7 +473,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.CustomerReturnNote.CustomerReturnNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.CustomerReturnNote.CustomerReturnNoteExchangeDto.Number">
@@ -518,7 +518,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverNote.DeliverNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverNote.DeliverNoteDetailExchangeDto.FromLocationErpCode">
@@ -573,7 +573,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverRequest.DeliverRequestDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverRequest.DeliverRequestDetailExchangeDto.AreaCode">
@@ -688,7 +688,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ErpLocationItem.ErpLocationItemExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ErpLocation.ErpLocationExchangeDto.Code">
@@ -733,7 +733,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.InjectionIssueRequest.InjectionIssueRequestDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.InjectionIssueRequest.InjectionIssueRequestDetailExchangeDto.RecommendType">
@@ -788,7 +788,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.IssueNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PCK.IssueNoteExchangeDto.Number">
@@ -843,7 +843,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemPack.ItemPackExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemPack.ItemPackExchangeDto.PackCode">
@@ -858,7 +858,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemPack.ItemPackExchangeDto.Remark">
             <summary>
-            零件规格/颜色
+            物品规格/颜色
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemPack.ItemPackExchangeDto.PackUom">
@@ -888,7 +888,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.MaterialRequest.MaterialRequestDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.MaterialRequest.MaterialRequestExchangeDto.Number">
@@ -908,7 +908,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.MesNote.MesNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.MesNote.MesNoteDetailExchangeDto.ToLocationErpCode">
@@ -978,7 +978,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductionReturnNote.ProductionReturnNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductionReturnNote.ProductionReturnNoteDetailExchangeDto.ToLocationErpCode">
@@ -1048,7 +1048,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteDetailExchangeDto.Remark">
@@ -1088,7 +1088,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteSumDetailExchangeDto.itemCode">
             <summary>
-            零件编号
+            物品编号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteSumDetailExchangeDto.locationCode">
@@ -1123,7 +1123,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleMaterialDetailExchangeDto.ProductItemCode">
             <summary>
-            产成品物料号
+            产成品ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleMaterialDetailExchangeDto.ProductLot">
@@ -1138,7 +1138,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleMaterialDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleMaterialDetailExchangeDto.Qty">
@@ -1153,7 +1153,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleNoteDetailExchangeDto.LocationErpCode">
@@ -1178,7 +1178,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleNoteExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleNoteExchangeDto.LocationErpCode">
@@ -1203,7 +1203,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchaseOrder.PurchaseOrderDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchaseOrder.PurchaseOrderDetailExchangeDto.Uom">
@@ -1273,7 +1273,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchasePrice.PurchasePriceExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchasePrice.PurchasePriceExchangeDto.SupplierCode">
@@ -1323,7 +1323,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchaseReceipt.PurchaseReceiptNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchaseReceipt.PurchaseReceiptNoteExchangeDto.Number">
@@ -1398,7 +1398,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchaseReturn.PurchaseReturnNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PurchaseReturn.PurchaseReturnNoteExchangeDto.Number">
@@ -1443,7 +1443,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PutawayNote.PutawayNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.PutawayNote.PutawayNoteDetailExchangeDto.ToLocationErpCode">
@@ -1528,7 +1528,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.RecycledMaterialReceiptNote.RecycledMaterialReceiptNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.RecycledMaterialReceiptNote.RecycledMaterialReceiptNoteDetailExchangeDto.LocationErpCode">
@@ -1558,7 +1558,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SalePrice.SalePriceExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SalePrice.SalePriceExchangeDto.CustomerCode">
@@ -1603,7 +1603,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ScrapNote.ScrapNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ScrapNote.ScrapNoteDetailExchangeDto.FromLocationCode">
@@ -1678,7 +1678,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.StdCostPrice.StdCostPriceExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.StdCostPrice.StdCostPriceExchangeDto.Description">
@@ -1758,7 +1758,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SuppplierAsn.SupplierAsnDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SuppplierAsn.SupplierAsnDetailExchangeDto.Remark">
@@ -1768,12 +1768,12 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SuppplierAsn.SupplierAsnDetailExchangeDto.SupplierItemCode">
             <summary>
-            供应商零件号
+            供应商ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SuppplierAsn.SupplierAsnDetailExchangeDto.SupplierItemName">
             <summary>
-            供应商零件名
+            供应商物品名
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SuppplierAsn.SupplierAsnExchangeDto.Number">
@@ -1833,17 +1833,17 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SupplierItem.SupplierItemExchangeDto.ItemCode">
             <summary>
-            物料号
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SupplierItem.SupplierItemExchangeDto.ItemName">
             <summary>
-            物料号名称
+            ERP料号名称
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SupplierItem.SupplierItemExchangeDto.SupplierItemCode">
             <summary>
-            供应商物料号
+            供应商ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.SupplierItem.SupplierItemExchangeDto.Version">
@@ -1913,7 +1913,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.TransferNote.TransferNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.TransferNote.TransferNoteDetailExchangeDto.ToLocationErpCode">
@@ -1978,7 +1978,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteDetailExchangeDto.FromLocationErpCode">
@@ -2043,7 +2043,7 @@
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteDetailExchangeDto.ItemCode">
             <summary>
-            物品代码
+            ERP料号
             </summary>
         </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteDetailExchangeDto.FromLocationErpCode">

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Enums/EnumIncomingDataType.cs

@@ -23,7 +23,7 @@ public enum EnumIncomingDataType
     /// </summary>
     Supplier = 4,
     /// <summary>
-    /// 供应商零件
+    /// 供应商物品
     /// </summary>
     SupplierItem = 5,
     /// <summary>
@@ -31,7 +31,7 @@ public enum EnumIncomingDataType
     /// </summary>
     Customer = 6,
     /// <summary>
-    /// 客户零件
+    /// 客户物品
     /// </summary>
     CustomerItem = 7,
     /// <summary>
@@ -111,7 +111,7 @@ public enum EnumIncomingDataType
     /// </summary>
     StdCostPrice=26,
     /// <summary>
-    /// Erp库位零件（开账）
+    /// Erp库位物品（开账）
     /// </summary>
     ErpLocationItem = 27,
     /// <summary>

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": "生产线",