Browse Source

修改 物品代码 物料代码等 为 ERP料号

dev_DY_CC
郑勃旭 11 months ago
parent
commit
476d849948
  1. 6
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/Product.cs
  2. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Mes/Issue/IssueNote.cs
  3. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/Boms/mes_bom.cs
  4. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ErpLocationItems/locdout.cs
  5. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/PurchasePrices/ismout.cs
  6. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/SalePrices/spriceout.cs
  7. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/ScontrolExchange/Scmsend.cs
  8. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Client/WebApi.cs
  9. 20
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs
  10. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
  11. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs
  12. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs
  13. 4
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs
  14. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs
  15. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs
  16. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/DTOs/MesProductL7PartsNoteDTO.cs
  17. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Mes/Mes/MesProductL7PartsNoteCreateOrUpdateInputBase.cs
  18. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetDto.cs
  19. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/asn_mstrs/AsnDetInput.cs
  20. 8
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomDto.cs
  21. 8
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/boms/BomInput.cs
  22. 8
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartDto.cs
  23. 8
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/cust_parts/CustPartInput.cs
  24. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryDto.cs
  25. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/inventorys/InventoryInput.cs
  26. 20
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartDto.cs
  27. 20
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/parts/PartInput.cs
  28. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetDto.cs
  29. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/po_mstrs/PoDetInput.cs
  30. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistDto.cs
  31. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prh_hists/PrhHistInput.cs
  32. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineDto.cs
  33. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/prod_lines/ProdLineInput.cs
  34. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetDto.cs
  35. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/receipts/ReceiptDetInput.cs
  36. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetDto.cs
  37. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/returns/ReturnDetInput.cs
  38. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetDto.cs
  39. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/sod_dets/SodDetInput.cs
  40. 8
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartDto.cs
  41. 8
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Contracts.Iac.Qad/vend_parts/VendPartInput.cs
  42. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Mes/Mes/MesProductL7PartsNoteAppService.cs
  43. 16
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/PrhHistAppService.cs
  44. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Application.Iac.Qad/SaleOrderAppService.cs
  45. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNote.cs
  46. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes/MesProductL7PartsNotes/MesProductL7PartsNoteManager.cs
  47. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/asn_mstrs/AsnDet.cs
  48. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/boms/bom.cs
  49. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/cust_parts/CustPart.cs
  50. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/inventorys/inventory.cs
  51. 10
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/parts/part.cs
  52. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/po_mstrs/PoDet.cs
  53. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prh_hists/PrhHist.cs
  54. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/prod_lines/ProdLine.cs
  55. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/receipts/ReceiptDet.cs
  56. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/returns/ReturnDet.cs
  57. 2
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/sod_dets/SodDet.cs
  58. 4
      be/DataExchange/Iac/Win_in.Sfs.Wms.DataExchange.Domain.Iac.Qad/vend_parts/VendPart.cs
  59. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteDetailExchangeDto.cs
  60. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/BackFlushNote/BackFlushNoteExchangeDto.cs
  61. 8
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/Bom/BomExchangeDto.cs
  62. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CountAdjustNote/CountAdjustNoteDetailExchangeDto.cs
  63. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/CustomerReturnNote/CustomerReturnNoteDetailExchangeDto.cs
  64. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteDetailExchangeDto.cs
  65. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverRequest/DeliverRequestDetailExchangeDto.cs
  66. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ErpLocationItem/ErpLocationItem.cs
  67. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/InjectionIssueRequest/InjectionIssueRequestDetailExchangeDto.cs
  68. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/IssueNote/IssueNoteDetailExchangeDto.cs
  69. 8
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs
  70. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MaterialRequest/MaterialRequestDetailExchangeDto.cs
  71. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MesNote/MesNoteDetailExchangeDto.cs
  72. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteDetailExchangeDto.cs
  73. 6
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteSumDetailExchangeDto.cs
  74. 8
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleMaterialDetailExchangeDto.cs
  75. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteDetailExchangeDto.cs
  76. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteExchangeDto.cs
  77. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductionReturnNote/ProductionReturnNoteDetailExchangeDto.cs
  78. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseOrder/PurchaseOrderDetailExchangeDto.cs
  79. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchasePrice/PurchasePriceExchangeDto.cs
  80. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReceipt/PurchaseReceiptNoteDetailExchangeDto.cs
  81. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PurchaseReturn/PurchaseReturnNoteDetailExchangeDto.cs
  82. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PutawayNote/PutawayNoteDetailExchangeDto.cs
  83. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/RecycledMaterialReceiptNote/RecycledMaterialReceiptNoteDetailExchangeDto.cs
  84. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SalePrice/SalePriceExchangeDto.cs
  85. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ScrapNote/ScrapNoteDetailExchangeDto.cs
  86. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/StdCostPrice/StdCostPriceExchangeDto.cs
  87. 12
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierAsn/SupplierAsnDetailExchangeDto.cs
  88. 12
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierItem/SupplierItemExchangeDto.cs
  89. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/TransferNote/TransferNoteDetailExchangeDto.cs
  90. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteDetailExchangeDto.cs
  91. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteDetailExchangeDto.cs
  92. 80
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
  93. 6
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Enums/EnumIncomingDataType.cs
  94. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Localization/DataExchange/zh-Hans.json
  95. 2
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/Bases/SfsDataExchangeDetailEntityBase.cs
  96. 42
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.MesAgent/JisInfoIncomingDataWorker.cs
  97. 4
      be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Domain.Shared/Localization/Auth/zh-Hans.json
  98. 2
      be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/MenuAdd.json
  99. 4
      be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/MaterialRequestDashboardDto.cs
  100. 4
      be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PlanAndActualDashboardDto.cs

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

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

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

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

4
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 public class mes_bom : Entity
{ {
/// <summary> /// <summary>
/// 父料号 /// 父ERP料号
/// </summary> /// </summary>
public string mes_bom_assy { get; set; } public string mes_bom_assy { get; set; }
/// <summary> /// <summary>
/// 子料号 /// 子ERP料号
/// </summary> /// </summary>
public string mes_bom_part { get; set; } public string mes_bom_part { get; set; }
/// <summary> /// <summary>

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

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

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

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

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

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

4
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; } public string CargoID { get; set; }
/// <summary> /// <summary>
/// 零件 /// ERP料
/// </summary> /// </summary>
[Newtonsoft.Json.JsonProperty("partCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] [Newtonsoft.Json.JsonProperty("partCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PartCode { get; set; } public string PartCode { get; set; }
@ -558,7 +558,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming
public string CargoID { get; set; } public string CargoID { get; set; }
/// <summary> /// <summary>
/// 零件 /// ERP料
/// </summary> /// </summary>
[Newtonsoft.Json.JsonProperty("partCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] [Newtonsoft.Json.JsonProperty("partCode", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PartCode { get; set; } public string PartCode { get; set; }

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

@ -135,7 +135,7 @@ public class InjectionMoldingRequestReader : IReader
sw.Stop(); sw.Stop();
//按区域、货位号、零件、标志 //按区域、货位号、物品、标志
var group= camralist.GroupBy(r => new { r.AreaID, r.CargoID, r.PartCode, r.Flag }); var group= camralist.GroupBy(r => new { r.AreaID, r.CargoID, r.PartCode, r.Flag });
//获取和次数相等的空闲数据 //获取和次数相等的空闲数据
var list = group.Where(r => r.Count() == invterval).ToList(); var list = group.Where(r => r.Count() == invterval).ToList();
@ -164,7 +164,7 @@ public class InjectionMoldingRequestReader : IReader
inputdetail.Add(jobrequestinput); 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() 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() } 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); injectionRequestDetails.Add(detailInput);
//} //}
input.Details.AddRange(injectionRequestDetails); input.Details.AddRange(injectionRequestDetails);
// 通过 BindAsync 方法对零件仓库进行赋值 // 通过 BindAsync 方法对物品仓库进行赋值
var errors = await BindAsync(input.Details).ConfigureAwait(false); var errors = await BindAsync(input.Details).ConfigureAwait(false);
if (errors.Count > 0) if (errors.Count > 0)
{ {
@ -278,22 +278,22 @@ public class InjectionMoldingRequestReader : IReader
/// <summary> /// <summary>
/// 绑定零件库位信息,如果对错误返回错误新列表 /// 绑定物品库位信息,如果对错误返回错误新列表
/// </summary> /// </summary>
/// <param name="p_list"></param> /// <param name="p_list"></param>
/// <returns></returns> /// <returns></returns>
private async Task<List<string>> BindAsync(List<InjectionIssueRequestDetailInput> p_list) private async Task<List<string>> BindAsync(List<InjectionIssueRequestDetailInput> p_list)
{ {
// 异步方法,将输入的请求绑定到对应的零件和库位信息,返回错误列表 // 异步方法,将输入的请求绑定到对应的物品和库位信息,返回错误列表
List<string> errors = new List<string>(); List<string> errors = new List<string>();
foreach (var request in p_list) foreach (var request in p_list)
{ {
// 获取对应零件信息 // 获取对应物品信息
var itm = await _itemService.GetByCodeAsync(request.ItemCode).ConfigureAwait(false); var itm = await _itemService.GetByCodeAsync(request.ItemCode).ConfigureAwait(false);
if (itm == null) { errors.Add($"编号:{request.ItemCode}零件表中没找到,请维护零件表!"); } if (itm == null) { errors.Add($"编号:{request.ItemCode}物品表中没找到,请维护物品表!"); }
else else
{ {
// 更新请求中的零件描述和名称 // 更新请求中的物品描述和名称
request.ItemDesc1 = itm.Desc1; request.ItemDesc1 = itm.Desc1;
request.ItemDesc2 = itm.Desc2; request.ItemDesc2 = itm.Desc2;
request.ItemName = itm.Name; request.ItemName = itm.Name;
@ -377,11 +377,11 @@ public class InjectionMoldingRequestReader : IReader
public class InjectionRequest public class InjectionRequest
{ {
/// <summary> /// <summary>
/// 零件M /// 物品M
/// </summary> /// </summary>
public string ItemCode { get; set; } public string ItemCode { get; set; }
/// <summary> /// <summary>
/// 零件名称 /// 物品名称
/// </summary> /// </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>

2
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); var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(back.Detail);
list.Add(wmsBackDetail); 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()) foreach (var detail in details.ToList())
{ {
var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(detail); var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(detail);

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

@ -153,7 +153,7 @@ public class MesOutConverter : IIncomingConverter
} }
else else
{ {
//todo 这里不应该做完工 没有零件 //todo 这里不应该做完工 没有物品
wmsProductReceiptNoteDetail.ItemName = ""; wmsProductReceiptNoteDetail.ItemName = "";
wmsProductReceiptNoteDetail.ItemDesc1 = ""; wmsProductReceiptNoteDetail.ItemDesc1 = "";
wmsProductReceiptNoteDetail.ItemDesc2 = ""; wmsProductReceiptNoteDetail.ItemDesc2 = "";

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs

@ -85,7 +85,7 @@ public class MesOutReader : IReader
incomingDataList.Add(incomingData); incomingDataList.Add(incomingData);
if (mesOut.Mesout_quality == "1") if (mesOut.Mesout_quality == "1")
{ {
//查询零件对应的客户库位 //查询物品对应的客户库位
string locationCode = await _customerItemAppService.GetFirstLocationCodeByItemCode(mesOut.Mesout_part).ConfigureAwait(false); string locationCode = await _customerItemAppService.GetFirstLocationCodeByItemCode(mesOut.Mesout_part).ConfigureAwait(false);
if (!string.IsNullOrEmpty(locationCode)) if (!string.IsNullOrEmpty(locationCode))
{ {

4
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.updatedt = DateTime.Now;
common.isupdate = false; common.isupdate = false;
Logger.LogInformation($"Read ItemBasic");//零件 Logger.LogInformation($"Read ItemBasic");//物品
var itemBasicReader = workerContext.ServiceProvider.GetRequiredService<ItemBasicReader>(); var itemBasicReader = workerContext.ServiceProvider.GetRequiredService<ItemBasicReader>();
var itemBasicConverter = workerContext.ServiceProvider.GetRequiredService<ItemBasicConverter>(); var itemBasicConverter = workerContext.ServiceProvider.GetRequiredService<ItemBasicConverter>();
//读取并保存itemBasic //读取并保存itemBasic
@ -127,7 +127,7 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
//转换Customer //转换Customer
await CustomerConverter.ConvertAsync(customersFromExternalList).ConfigureAwait(false); await CustomerConverter.ConvertAsync(customersFromExternalList).ConfigureAwait(false);
Logger.LogInformation($"Read ErpLocationItem");//储位与零件对应关系(开账) Logger.LogInformation($"Read ErpLocationItem");//储位与物品对应关系(开账)
var ErpLocationItemReader = workerContext.ServiceProvider.GetRequiredService<ErpLocationItemReader>(); var ErpLocationItemReader = workerContext.ServiceProvider.GetRequiredService<ErpLocationItemReader>();
var ErpLocationItemConverter = workerContext.ServiceProvider.GetRequiredService<ErpLocationItemConverter>(); var ErpLocationItemConverter = workerContext.ServiceProvider.GetRequiredService<ErpLocationItemConverter>();
//读取并保存ErpLocationItem //读取并保存ErpLocationItem

2
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; string tyrpNumber = outgoingFromWms.TyrpNumber;
var wmsReceipt = JsonSerializer.Deserialize<ProductReceiptNoteDTO>(outgoingFromWms.DataContent); 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) foreach (var detail in wmsReceipt.Details)
{ {
// string number = index > 0 ? wmsReceipt.Number + index.ToString() : wmsReceipt.Number; // string number = index > 0 ? wmsReceipt.Number + index.ToString() : wmsReceipt.Number;

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs

@ -49,7 +49,7 @@ public class ScontrolWriter : IWriter
} }
try 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 }) //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 // .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, // , 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,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
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() return !(await _mesProductL7PartsNoteRepository.GetQueryableAsync().ConfigureAwait(false)).Any()
? 0 ? 0
: :
//转到实现,保存【L7级零件关系】 //转到实现,保存【L7级物品关系】
(await _mesProductL7PartsNoteRepository.GetQueryableAsync().ConfigureAwait(false)).Max(p => p.RowID); (await _mesProductL7PartsNoteRepository.GetQueryableAsync().ConfigureAwait(false)).Max(p => p.RowID);
} }

16
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.CheckSite(_configuration, entityObj.Site);
Validator.CheckCompany(_configuration, entityObj.Company); Validator.CheckCompany(_configuration, entityObj.Company);
//获取零件的基本信息 //获取物品的基本信息
ItemBasicDTO itemBasic = await _itemBasicAppService.GetByCodeAsync(input.Part).ConfigureAwait(false); ItemBasicDTO itemBasic = await _itemBasicAppService.GetByCodeAsync(input.Part).ConfigureAwait(false);
string poNumber = entityObj.PoNumber; //收货单号 string poNumber = entityObj.PoNumber; //收货单号
@ -99,7 +99,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService
//跟WMS不错处理,直接在DataExchange中记录错误 //跟WMS不错处理,直接在DataExchange中记录错误
entityObj.ErrorCode = 9; 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.PoNumber = entityObj.PoNumber;
//existNoteDetail.PoLine = entityObj.Line.ToString(); //existNoteDetail.PoLine = entityObj.Line.ToString();
@ -109,7 +109,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService
//existNoteDetail.Item = new Shared.Domain.Item(); //existNoteDetail.Item = new Shared.Domain.Item();
//existNoteDetail.Item =new Item(itemBasic.Id, itemBasic.Name, itemBasic.Desc1, itemBasic.Desc2); //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; //existNoteDetail.ItemCode = entityObj.Part;
////lot 批次 lot ////lot 批次 lot
//existNoteDetail.Lot = entityObj.Lot; //existNoteDetail.Lot = entityObj.Lot;
@ -164,7 +164,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService
detailInput.ItemDesc1 = itemBasic.Desc1; detailInput.ItemDesc1 = itemBasic.Desc1;
detailInput.ItemDesc2 = itemBasic.Desc2; detailInput.ItemDesc2 = itemBasic.Desc2;
//part 零件号 Truck license plate number //part ERP料号 Truck license plate number
detailInput.ItemCode = entityObj.Part; detailInput.ItemCode = entityObj.Part;
//lot 批次 lot //lot 批次 lot
detailInput.Lot = entityObj.Lot; detailInput.Lot = entityObj.Lot;
@ -267,7 +267,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService
detailInput.ItemDesc1 = itemBasic.Desc1; detailInput.ItemDesc1 = itemBasic.Desc1;
detailInput.ItemDesc2 = itemBasic.Desc2; detailInput.ItemDesc2 = itemBasic.Desc2;
//part 零件号 Truck license plate number //part ERP料号 Truck license plate number
detailInput.ItemCode = entityObj.Part; detailInput.ItemCode = entityObj.Part;
//lot 批次 lot //lot 批次 lot
detailInput.Lot = entityObj.Lot; detailInput.Lot = entityObj.Lot;
@ -339,7 +339,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService
//跟WMS不错处理,直接在DataExchange中记录错误 //跟WMS不错处理,直接在DataExchange中记录错误
entityObj.ErrorCode = 9; 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 #endregion
} }
@ -363,7 +363,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService
detailInput.ItemDesc1 = itemBasic.Desc1; detailInput.ItemDesc1 = itemBasic.Desc1;
detailInput.ItemDesc2 = itemBasic.Desc2; detailInput.ItemDesc2 = itemBasic.Desc2;
//part 零件号 Truck license plate number //part ERP料号 Truck license plate number
detailInput.ItemCode = entityObj.Part; detailInput.ItemCode = entityObj.Part;
//lot 批次 lot //lot 批次 lot
detailInput.Lot = entityObj.Lot; detailInput.Lot = entityObj.Lot;
@ -464,7 +464,7 @@ public class PrhHistAppService : ApplicationService, IPrhHistAppService
detailInput.ItemDesc1 = itemBasic.Desc1; detailInput.ItemDesc1 = itemBasic.Desc1;
detailInput.ItemDesc2 = itemBasic.Desc2; detailInput.ItemDesc2 = itemBasic.Desc2;
//part 零件号 Truck license plate number //part ERP料号 Truck license plate number
detailInput.ItemCode = entityObj.Part; detailInput.ItemCode = entityObj.Part;
//lot 批次 lot //lot 批次 lot
detailInput.Lot = entityObj.Lot; detailInput.Lot = entityObj.Lot;

2
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 = entityObj.Qty; //到货数量
//detailObj.Qty.Uom = ; //到货数量 //detailObj.Qty.Uom = ; //到货数量
detailObj.StdPackQty = entityObj.StdPackQty.TryToDecimalZero(); //标准包装 detailObj.StdPackQty = entityObj.StdPackQty.TryToDecimalZero(); //标准包装
detailObj.ItemCode = entityObj.PartCode; //物品代码 detailObj.ItemCode = entityObj.PartCode; //ERP料号
//detailObj.Item.Name = ; //物品 //detailObj.Item.Name = ; //物品
targetObj.Details.Add(detailObj); targetObj.Details.Add(detailObj);

4
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; namespace Win_in.Sfs.Wms.DataExchange.Domain.Iac.Mes.MesProductL7PartsNotes;
/// <summary> /// <summary>
/// MesL7级零件对照关系 /// MesL7级物品对照关系
/// </summary> /// </summary>
public class MesProductL7PartsNote : SfsAggregateRootBase public class MesProductL7PartsNote : SfsAggregateRootBase
@ -52,7 +52,7 @@ public class MesProductL7PartsNote : SfsAggregateRootBase
public string Configuration { get; set; } public string Configuration { get; set; }
/// <summary> /// <summary>
/// L7零件 /// L7ERP料
/// </summary> /// </summary>
public string L7Part { get; set; } public string L7Part { get; set; }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

8
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs

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

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

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/MesNote/MesNoteDetailExchangeDto.cs

@ -11,9 +11,9 @@ public class MesNoteDetailExchangeDto
[Display(Name = "移库单号")] [Display(Name = "移库单号")]
public string Number { get; set; } public string Number { get; set; }
/// <summary> /// <summary>
/// 物品代码 /// ERP料号
/// </summary> /// </summary>
[Display(Name = "物品代码")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }
/// <summary> /// <summary>

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteDetailExchangeDto.cs

@ -45,9 +45,9 @@ public class ProductReceiptNoteDetailExchangeDto
[Display(Name = "Erp储位")] [Display(Name = "Erp储位")]
public string LocationErpCode { get; set; } public string LocationErpCode { get; set; }
/// <summary> /// <summary>
/// 物品代码 /// ERP料号
/// </summary> /// </summary>
[Display(Name = "物品代码")] [Display(Name = "ERP料号")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
[Required(ErrorMessage = "{0}是必填项")] [Required(ErrorMessage = "{0}是必填项")]
public string ItemCode { get; set; } public string ItemCode { get; set; }

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

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

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductRecycleNote/ProductRecycleNoteDetailExchangeDto.cs

@ -10,9 +10,9 @@ public class ProductRecycleNoteDetailExchangeDto
[Display(Name = "数量")] [Display(Name = "数量")]
public decimal Qty { get; set; } public decimal Qty { get; set; }
/// <summary> /// <summary>
/// 物品代码 /// ERP料号
/// </summary> /// </summary>
[Display(Name = "物品代码")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }

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

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductionReturnNote/ProductionReturnNoteDetailExchangeDto.cs

@ -10,9 +10,9 @@ public class ProductionReturnNoteDetailExchangeDto
[Display(Name = "上架单号")] [Display(Name = "上架单号")]
public string Number { get; set; } public string Number { get; set; }
/// <summary> /// <summary>
/// 物品代码 /// ERP料号
/// </summary> /// </summary>
[Display(Name = "物品代码")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }
/// <summary> /// <summary>

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

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

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

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

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/PutawayNote/PutawayNoteDetailExchangeDto.cs

@ -16,9 +16,9 @@ public class PutawayNoteDetailExchangeDto
[Display(Name = "订单号")] [Display(Name = "订单号")]
public string PoNumber { get; set; } public string PoNumber { get; set; }
/// <summary> /// <summary>
/// 物品代码 /// ERP料号
/// </summary> /// </summary>
[Display(Name = "物品代码")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }
/// <summary> /// <summary>

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

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

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

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

12
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/SupplierAsn/SupplierAsnDetailExchangeDto.cs

@ -128,9 +128,9 @@ public class SupplierAsnDetailExchangeDto
// [Display(Name = "过期时间")] // [Display(Name = "过期时间")]
// public DateTime ExpireDate { get; set; } = DateTime.MaxValue; // public DateTime ExpireDate { get; set; } = DateTime.MaxValue;
/// <summary> /// <summary>
/// 物品代码 /// ERP料号
/// </summary> /// </summary>
[Display(Name = "物品代码")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }
/// <summary> /// <summary>
@ -140,14 +140,14 @@ public class SupplierAsnDetailExchangeDto
public string Remark { get; set; } public string Remark { get; set; }
/// <summary> /// <summary>
/// 供应商零件 /// 供应商ERP料
/// </summary> /// </summary>
[Display(Name = "供应商零件号")] [Display(Name = "供应商ERP料号")]
public string SupplierItemCode { get; set; } public string SupplierItemCode { get; set; }
/// <summary> /// <summary>
/// 供应商零件 /// 供应商物品
/// </summary> /// </summary>
[Display(Name = "供应商零件名")] [Display(Name = "供应商物品名")]
public string SupplierItemName { get; set; } public string SupplierItemName { get; set; }
} }

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

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/TransferNote/TransferNoteDetailExchangeDto.cs

@ -10,9 +10,9 @@ public class TransferNoteDetailExchangeDto
[Display(Name = "移库单号")] [Display(Name = "移库单号")]
public string Number { get; set; } public string Number { get; set; }
/// <summary> /// <summary>
/// 物品代码 /// ERP料号
/// </summary> /// </summary>
[Display(Name = "物品代码")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }
/// <summary> /// <summary>

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

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

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

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

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

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

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Localization/DataExchange/zh-Hans.json

@ -12,7 +12,7 @@
"AbpIdentity": "权限控制", "AbpIdentity": "权限控制",
"Warehouse": "仓库", "Warehouse": "仓库",
"Area": "区域", "Area": "区域",
"AreaItem": "区域零件", "AreaItem": "区域物品",
"InterfaceCalendar": "日历接口", "InterfaceCalendar": "日历接口",
"Calendar": "日历", "Calendar": "日历",
"Company": "公司", "Company": "公司",
@ -37,7 +37,7 @@
"LocationGroup": "库位组", "LocationGroup": "库位组",
"UserWorkGroup": "工作组", "UserWorkGroup": "工作组",
"Location": "库位", "Location": "库位",
"ItemStoreRelation": "库位零件关系维护", "ItemStoreRelation": "库位物品关系维护",
"InventoryLocationCapacity": "库位可用容量", "InventoryLocationCapacity": "库位可用容量",
"Workshop": "车间", "Workshop": "车间",
"ProductionLine": "生产线", "ProductionLine": "生产线",

2
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(); //public Item Item { get; set; } = new Item();
///// <summary> ///// <summary>
///// 物品代码 ///// ERP料号
///// </summary> ///// </summary>
//public string ItemCode { get; set; } //public string ItemCode { get; set; }
} }

42
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; namespace Win_in.Sfs.Wms.DataExchange.MesAgent;
/// <summary> /// <summary>
/// 传输相关的L7零件信息 /// 传输相关的L7物品信息
/// </summary> /// </summary>
public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase 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}"); 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."); Logger.LogInformation($"{SendLogTitieString}Changing file data to MesProductL7PartsNoteCreateInput.");
@ -224,20 +224,20 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
#region 开始保存Store DataBase #region 开始保存Store DataBase
#region 添加没有的配置码零件信息 #region 添加没有的配置码物品信息
Logger.LogInformation($"{SendLogTitieString}Start adding exist file data in 开始保存Store Database.File name is {fileName}"); 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 L7PartCodes = deInputs.Select(p => p.L7Part).Distinct().ToList();
//需要查询的零件列表 //需要查询的物品列表
var partCodeList = deInputs.Select(p => p.Configuration).Distinct().ToList(); var partCodeList = deInputs.Select(p => p.Configuration).Distinct().ToList();
partCodeList.AddRange(L7PartCodes); partCodeList.AddRange(L7PartCodes);
//按照零件进行归总 //按照物品进行归总
var sumEntityList = deInputs.GroupBy(p => new { p.Year, p.ProductNo, p.Program, p.FATA, p.Configuration, p.Position }).ToList(); 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 }; SfsBaseDataRequestInputBase requestInput = new SfsBaseDataRequestInputBase() { MaxResultCount = 999 };
if (L7PartCodes.Count > 0) if (L7PartCodes.Count > 0)
{ {
@ -250,13 +250,13 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
var itemDtoListResult = await itemBasicAppService.GetPagedListByFilterAsync(requestInput, false).ConfigureAwait(false); var itemDtoListResult = await itemBasicAppService.GetPagedListByFilterAsync(requestInput, false).ConfigureAwait(false);
//返回的所有需要的零件信息表 //返回的所有需要的物品信息表
var itemBaseList = itemDtoListResult.Items; var itemBaseList = itemDtoListResult.Items;
Logger.LogInformation($"{SendLogTitieString}Finished geting item basic infos.Info count is{itemDtoListResult.Items.Count}."); Logger.LogInformation($"{SendLogTitieString}Finished geting item basic infos.Info count is{itemDtoListResult.Items.Count}.");
#endregion #endregion
#region 开始构建Store的L7零件结构表 #region 开始构建Store的L7物品结构表
List<ProductL7PartsNoteEditInput> noteList = new List<ProductL7PartsNoteEditInput>(); List<ProductL7PartsNoteEditInput> noteList = new List<ProductL7PartsNoteEditInput>();
foreach (var sumEntity in sumEntityList) foreach (var sumEntity in sumEntityList)
@ -325,7 +325,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
var itemBase = itemBaseList.FirstOrDefault(p => p.Code == detail.L7Part); var itemBase = itemBaseList.FirstOrDefault(p => p.Code == detail.L7Part);
if (itemBase == null) if (itemBase == null)
{ {
//throw new Exception($"未找到零件{detail.L7PartCode}的零件基础信息,请确认基础信息是否齐全!"); //throw new Exception($"未找到物品{detail.L7PartCode}的物品基础信息,请确认基础信息是否齐全!");
} }
else else
@ -340,10 +340,10 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
noteList.Add(note); noteList.Add(note);
} }
#endregion 开始构建Store的L7零件结构表 #endregion 开始构建Store的L7物品结构表
Logger.LogInformation($"{SendLogTitieString}Starting productL7PartsNoteAppService.CreateAsync."); Logger.LogInformation($"{SendLogTitieString}Starting productL7PartsNoteAppService.CreateAsync.");
//开始添加在Store数据库中的L7零件信息 //开始添加在Store数据库中的L7物品信息
await productL7PartsNoteAppService.CreateAsync(noteList).ConfigureAwait(false); await productL7PartsNoteAppService.CreateAsync(noteList).ConfigureAwait(false);
Logger.LogInformation($"{SendLogTitieString}Finished productL7PartsNoteAppService.CreateAsync."); Logger.LogInformation($"{SendLogTitieString}Finished productL7PartsNoteAppService.CreateAsync.");
@ -361,7 +361,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
} }
/// <summary> /// <summary>
/// 插入对应的零件基础信息 /// 插入对应的物品基础信息
/// </summary> /// </summary>
private static async Task InsertItemBasic(string program, string productNo, string configuration, string fata, string position, IItemBasicAppService itemBasicAppService) 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 position = strs[0]; //位置
string FATA = strs[1]; //Fata string FATA = strs[1]; //Fata
string configuration = strs[2]; //配置码 string configuration = strs[2]; //配置码
string l7Part = strs[3]; //L7零件 string l7Part = strs[3]; //L7ERP料
string qty = strs[4]; //数量 string qty = strs[4]; //数量
MesProductL7PartsNoteCreateInput createInput = new MesProductL7PartsNoteCreateInput() MesProductL7PartsNoteCreateInput createInput = new MesProductL7PartsNoteCreateInput()
@ -517,11 +517,11 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
#region Delete Store Database Data #region Delete Store Database Data
Logger.LogInformation($"{SendLogTitieString}Start deleteing exist file data in Store Database.File name is {fileName}"); 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."); Logger.LogInformation($"{SendLogTitieString}Starting productL7PartsNoteAppService.DeleteByBaseInfoAsync.");
//保存相关L7零件信息 //保存相关L7物品信息
await productL7PartsNoteAppService.DeleteByBaseInfoAsync(year, program, productNo).ConfigureAwait(false); await productL7PartsNoteAppService.DeleteByBaseInfoAsync(year, program, productNo).ConfigureAwait(false);
Logger.LogInformation($"{SendLogTitieString}Finished productL7PartsNoteAppService.DeleteByBaseInfoAsync."); 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}"); 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); await mesProductL7PartsNoteAppService.DeleteByBaseInfoAsync(year, program, productNo).ConfigureAwait(false);
@ -601,8 +601,8 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
// mesNotes.AddRange(inputList); // mesNotes.AddRange(inputList);
// } // }
// #region 添加所有的L7零件信息 // #region 添加所有的L7物品信息
// //获取所有的L7零件信息,并获取零件是不是采购件、制造件 // //获取所有的L7物品信息,并获取物品是不是采购件、制造件
// var L7PartCodes = mesNotes.Select(p => p.L7Part).Distinct().ToList(); // var L7PartCodes = mesNotes.Select(p => p.L7Part).Distinct().ToList();
// Logger.LogInformation("{SendLogTitieString}Initial mesProductL7PartsNoteAppService..."); // Logger.LogInformation("{SendLogTitieString}Initial mesProductL7PartsNoteAppService...");
@ -647,7 +647,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
// #endregion // #endregion
// //按照零件进行归总 // //按照物品进行归总
// var sumEntityList = mesNotes.GroupBy(p => new { p.ProductNo, p.Program, p.FATA, p.Configuration, p.Position }).ToList(); // var sumEntityList = mesNotes.GroupBy(p => new { p.ProductNo, p.Program, p.FATA, p.Configuration, p.Position }).ToList();
// List<ProductL7PartsNoteCreateInput> noteList = new List<ProductL7PartsNoteCreateInput>(); // List<ProductL7PartsNoteCreateInput> noteList = new List<ProductL7PartsNoteCreateInput>();
@ -715,7 +715,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
// var itemBase = itemBaseList.FirstOrDefault(p => p.Code == detail.L7Part); // var itemBase = itemBaseList.FirstOrDefault(p => p.Code == detail.L7Part);
// if (itemBase == null) // if (itemBase == null)
// { // {
// //throw new Exception($"未找到零件{detail.L7PartCode}的零件基础信息,请确认基础信息是否齐全!"); // //throw new Exception($"未找到物品{detail.L7PartCode}的物品基础信息,请确认基础信息是否齐全!");
// } // }
// else // else
@ -741,7 +741,7 @@ public class JisInfoIncomingDataWorker : AsyncPeriodicBackgroundWorkerBase
// Logger.LogInformation($"{SendLogTitieString}productL7PartsNoteAppService.CreateAsync," + productL7PartsNoteAppService.ToString()); // Logger.LogInformation($"{SendLogTitieString}productL7PartsNoteAppService.CreateAsync," + productL7PartsNoteAppService.ToString());
// //保存相关L7零件信息 // //保存相关L7物品信息
// await productL7PartsNoteAppService.CreateAsync(noteList); // await productL7PartsNoteAppService.CreateAsync(noteList);
// Logger.LogInformation($"{SendLogTitieString}productL7PartsNoteAppService.CreateAsync 结束"); // Logger.LogInformation($"{SendLogTitieString}productL7PartsNoteAppService.CreateAsync 结束");

4
be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Domain.Shared/Localization/Auth/zh-Hans.json

@ -12,7 +12,7 @@
"AbpIdentity": "权限控制", "AbpIdentity": "权限控制",
"Warehouse": "仓库", "Warehouse": "仓库",
"Area": "区域", "Area": "区域",
"AreaItem": "区域零件", "AreaItem": "区域物品",
"InterfaceCalendar": "日历接口", "InterfaceCalendar": "日历接口",
"Calendar": "日历", "Calendar": "日历",
"Company": "公司", "Company": "公司",
@ -37,7 +37,7 @@
"LocationGroup": "库位组", "LocationGroup": "库位组",
"UserWorkGroup": "工作组", "UserWorkGroup": "工作组",
"Location": "库位", "Location": "库位",
"ItemStoreRelation": "库位零件关系维护", "ItemStoreRelation": "库位物品关系维护",
"InventoryLocationCapacity": "库位可用容量", "InventoryLocationCapacity": "库位可用容量",
"Workshop": "车间", "Workshop": "车间",
"ProductionLine": "生产线", "ProductionLine": "生产线",

2
be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/MenuAdd.json

@ -7,7 +7,7 @@
"company": "IACHZ", "company": "IACHZ",
"description": "库存查询", "description": "库存查询",
"status": 1, "status": 1,
"name": "按零件查询库存", "name": "按物品查询库存",
"icon": "/static/menus/parts.svg", "icon": "/static/menus/parts.svg",
"route": "/pages/inventory/item" "route": "/pages/inventory/item"
} }

4
be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/MaterialRequestDashboardDto.cs

@ -17,7 +17,7 @@ public class MaterialRequestUnIssuedItemQtySumDto
public class MaterialRequestUnReceivedItemQtyByItemDto public class MaterialRequestUnReceivedItemQtyByItemDto
{ {
[Display(Name = "料号")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }
[Display(Name = "总数")] [Display(Name = "总数")]
@ -38,7 +38,7 @@ public class MaterialRequestUnReceivedItemDto
[Display(Name = "单据号")] [Display(Name = "单据号")]
public string Number { get; set; } public string Number { get; set; }
[Display(Name = "料号")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }
[Display(Name = "物料描述")] [Display(Name = "物料描述")]

4
be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/PlanAndActualDashboardDto.cs

@ -17,9 +17,9 @@ public class PlanAndActualDashboardDto
public string SupplierShortName { get; set; } public string SupplierShortName { get; set; }
/// <summary> /// <summary>
/// 料号 /// ERP料号
/// </summary> /// </summary>
[Display(Name = "料号")] [Display(Name = "ERP料号")]
public string ItemCode { get; set; } public string ItemCode { get; set; }
/// <summary> /// <summary>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save