zhibinlv
/
FIS_GLM
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

批量修改

master
me 3 weeks ago
parent
2092a38cbb
commit
5e9b343d3e
48 changed files with 246 additions and 245 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/NewM100AppService.cs
  2. 22
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgTransmission/PaiGe/MsgTransmissionAppService.cs
  3. 10
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml
  4. 2
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.DbMigrator/appsettings.json
  5. 69
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/DicItemDataSeederContributor.cs
  6. 8
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Services/DicDomainService.cs
  7. 12
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/CacheManagerDomainService.cs
  8. 254
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100CheckDomainService.cs
  9. 2
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.BomInterface/Services/SyncAssemblyService.cs
  10. 6
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.BomInterface/appsettings.json
  11. 10
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/Messages/MsgTransmissionService.cs
  12. 8
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/appsettings.json
  13. 6
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/Services/FileParse.cs
  14. 8
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/appsettings.Development.json
  15. 8
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/appsettings.json
  16. 12
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/Messages/MsgTransmissionService.cs
  17. 10
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json
  18. 2
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleMoveFile/appsettings.json
  19. 6
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/appsettings.json
  20. 8
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/appsettings.json
  21. 2
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/wwwroot/static/js/chunk-5e9b71b5.b7142855.js
  22. 2
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/wwwroot/static/js/chunk-62062bae.7d0067f4.js
  23. 2
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/wwwroot/static/js/chunk-b83932fc.b52aee7c.js
  24. 2
      Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/wwwroot/static/js/chunk-de0cc00c.ef5d3286.js
  25. BIN
      Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg
  26. BIN
      Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll
  27. BIN
      Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb
  28. BIN
      Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll
  29. BIN
      Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb
  30. 2
      Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec
  31. 2
      Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfo.cs
  32. 2
      Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfoInputs.cache
  33. BIN
      Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
  34. BIN
      Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll
  35. BIN
      Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb
  36. BIN
      Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll
  37. BIN
      Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll
  38. BIN
      Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg
  39. BIN
      Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll
  40. BIN
      Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb
  41. 2
      Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec
  42. 2
      Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfo.cs
  43. 2
      Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfoInputs.cache
  44. BIN
      Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
  45. BIN
      Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll
  46. BIN
      Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb
  47. BIN
      Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll
  48. BIN
      Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll

8
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgCheck/BillM100s/NewM100AppService.cs
View File

@ -77,12 +77,12 @@ namespace WY.NewJit.MsgCheck
#region 缓存
/// <summary>
/// R100派格车型对应生产线
/// R100格拉默车型对应生产线
/// </summary>
private static List<DicItem> _r100VehicleModelProductLineList = new List<DicItem>();
/// <summary>
/// M100派格车型对应生产线
/// M100格拉默车型对应生产线
/// </summary>
private static List<DicItem> _m100VehicleModelProductLineList = new List<DicItem>();
#endregion
@ -469,7 +469,7 @@ select * from
#region 生产线赋值
//根据车型取对应生产线
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100派格车型对应生产线);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100格拉默车型对应生产线);
var obj3 = _m100VehicleModelProductLineList.FirstOrDefault(itm => itm.DicItemCode == bill.VehicleModelCode);
if (obj3 != null)
@ -479,7 +479,7 @@ select * from
}
else
{
string errorMsg = $"派格车型{bill.VehicleModelCode}没有对应的生产线:" + bill.VIN;
string errorMsg = $"格拉默车型{bill.VehicleModelCode}没有对应的生产线:" + bill.VIN;
throw new Exception(errorMsg);
}

22
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgTransmission/PaiGe/MsgTransmissionAppService.cs
View File

@ -121,17 +121,17 @@ namespace WY.NewJit.MsgTransmission.PaiGe
#region 缓存
/// <summary>
/// 报文车型对应派格车型
/// 报文车型对应格拉默车型
/// </summary>
private static List<DicItem> _msgToPaiGeVehicleModelList = new List<DicItem>();
/// <summary>
/// R100派格车型对应生产线
/// R100格拉默车型对应生产线
/// </summary>
private static List<DicItem> _r100VehicleModelProductLineList = new List<DicItem>();
/// <summary>
/// M100派格车型对应生产线
/// M100格拉默车型对应生产线
/// </summary>
private static List<DicItem> _m100VehicleModelProductLineList = new List<DicItem>();
@ -366,9 +366,9 @@ namespace WY.NewJit.MsgTransmission.PaiGe
//_r100CheckDomainSrv.InitPub(vehicleAssemblyIdList, vehicle2partList, erpAssemblyMainList, erp2partList);
//_m100CheckDomainService.InitPub(vehicleAssemblyIdList, vehicle2partList, erpAssemblyMainList, erp2partList);
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应派格车型);
_r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100派格车型对应生产线);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100派格车型对应生产线);
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应格拉默车型);
_r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100格拉默车型对应生产线);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100格拉默车型对应生产线);
//结算件切换列表
//string partSwitchSql = @"select SourcePartCode, TargetPartCode, ActiveBeginTime, ActiveEndTime from FisPartSwitch where ActiveBeginTime is null or ActiveBeginTime <= convert(datetime,'{0}')";
//partSwitchSql = string.Format(partSwitchSql, ServerHelper.CurrentDateTimeString);
@ -495,7 +495,7 @@ namespace WY.NewJit.MsgTransmission.PaiGe
if (billResObj.R100Bill != null)
{
var bill = billResObj.R100Bill;
//报文车型转换为派格车型：3H 转 CC；FY 转 Q5
//报文车型转换为格拉默车型：3H 转 CC；FY 转 Q5
var obj1 = _msgToPaiGeVehicleModelList.FirstOrDefault(itm => itm.DicItemCode == bill.VehicleModelCode);
if (obj1 != null)
{
@ -515,13 +515,13 @@ namespace WY.NewJit.MsgTransmission.PaiGe
}
else
{
string errorMsg = $"派格车型{bill.VehicleModelCode}没有对应的生产线！";
string errorMsg = $"格拉默车型{bill.VehicleModelCode}没有对应的生产线！";
throw new Exception(errorMsg);
}
}
else
{
string errorMsg = $"报文车型{bill.VehicleModelCode}没有对应的派格车型！";
string errorMsg = $"报文车型{bill.VehicleModelCode}没有对应的格拉默车型！";
throw new Exception(errorMsg);
}
}
@ -548,13 +548,13 @@ namespace WY.NewJit.MsgTransmission.PaiGe
}
else
{
string errorMsg = $"派格车型{bill.VehicleModelCode}没有对应的生产线！";
string errorMsg = $"格拉默车型{bill.VehicleModelCode}没有对应的生产线！";
throw new Exception(errorMsg);
}
}
else
{
string errorMsg = $"报文车型{bill.VehicleModelCode}没有对应的派格车型！";
string errorMsg = $"报文车型{bill.VehicleModelCode}没有对应的格拉默车型！";
throw new Exception(errorMsg);
}
}

10
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml
View File

@ -1333,12 +1333,12 @@
</member>
<member name="F:WY.NewJit.MsgCheck.NewM100AppService._r100VehicleModelProductLineList">
<summary>
R100派格车型对应生产线
R100格拉默车型对应生产线
</summary>
</member>
<member name="F:WY.NewJit.MsgCheck.NewM100AppService._m100VehicleModelProductLineList">
<summary>
M100派格车型对应生产线
M100格拉默车型对应生产线
</summary>
</member>
<member name="P:WY.NewJit.MsgCheck.NewM100AppService._errorMessagePrefix">
@ -1998,17 +1998,17 @@
</member>
<member name="F:WY.NewJit.MsgTransmission.PaiGe.MsgTransmissionAppService._msgToPaiGeVehicleModelList">
<summary>
报文车型对应派格车型
报文车型对应格拉默车型
</summary>
</member>
<member name="F:WY.NewJit.MsgTransmission.PaiGe.MsgTransmissionAppService._r100VehicleModelProductLineList">
<summary>
R100派格车型对应生产线
R100格拉默车型对应生产线
</summary>
</member>
<member name="F:WY.NewJit.MsgTransmission.PaiGe.MsgTransmissionAppService._m100VehicleModelProductLineList">
<summary>
M100派格车型对应生产线
M100格拉默车型对应生产线
</summary>
</member>
<member name="F:WY.NewJit.MsgTransmission.PaiGe.MsgTransmissionAppService._partCfgList">

2
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.DbMigrator/appsettings.json
View File

@ -1,6 +1,6 @@
{
"ConnectionStrings": {
"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008"
"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021"
/*"Default": "Server=192.168.0.213;Database=NewJitPG;uid=sa;pwd=Microsoft@2021"*/
/*"Default": "Server=LAPTOP-4TE7UPMR\\MYSQLSERVER;Database=NewJit;uid=sa;pwd=1"*/
},

69
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/DicItemDataSeederContributor.cs
View File

@ -41,6 +41,7 @@ namespace WY.NewJit.MsgBaseData
[UnitOfWork]
public async Task SeedAsync(DataSeedContext context)
{
return;
if (string.IsNullOrEmpty(ConfigDic.CurrentVersion))
{
ConfigDic.CurrentVersion = _configuration["ConfigDic:CurrentVersion"];
@ -57,51 +58,51 @@ namespace WY.NewJit.MsgBaseData
}
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.报文车型, DicTypeName.报文车型));
await _dicItemRepository.InsertManyAsync(dicItemLst);
//派格车型
//格拉默车型
dicItemLst = new List<DicItem>();
arr = new string[] { "B8L", "B9", "BSMV", "C8", "CC", "Q5", "Q6" };
foreach (string itm in arr)
{
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.派格车型, itm, itm));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.格拉默车型, itm, itm));
}
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.派格车型, DicTypeName.派格车型));
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.格拉默车型, DicTypeName.格拉默车型));
await _dicItemRepository.InsertManyAsync(dicItemLst);
//报文车型对应派格车型
//报文车型对应格拉默车型
dicItemLst = new List<DicItem>();
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "0V", "BSMV"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "3C", "B8L"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "3C", "B8L-PHEV"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "3H", "CC"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "4K", "C8"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "4K", "C8-PHEV"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "8W", "B9"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "FY", "Q5"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, "GE", "Q6"));
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.报文车型对应派格车型, DicTypeName.报文车型对应派格车型));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "0V", "BSMV"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "3C", "B8L"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "3C", "B8L-PHEV"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "3H", "CC"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "4K", "C8"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "4K", "C8-PHEV"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "8W", "B9"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "FY", "Q5"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, "GE", "Q6"));
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.报文车型对应格拉默车型, DicTypeName.报文车型对应格拉默车型));
await _dicItemRepository.InsertManyAsync(dicItemLst);
//M100派格车型对应生产线
//M100格拉默车型对应生产线
dicItemLst = new List<DicItem>();
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "C8", "01"));
//dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "C8 - PHEV", "01"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "B8L", "05"));
//dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "B8L - PHEV", "05"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "BSMV", "05"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "CC", "05"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "B9", "07"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "Q6", "07"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, "Q5", "08"));
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.M100派格车型对应生产线, DicTypeName.M100派格车型对应生产线));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "C8", "01"));
//dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "C8 - PHEV", "01"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "B8L", "05"));
//dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "B8L - PHEV", "05"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "BSMV", "05"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "CC", "05"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "B9", "07"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "Q6", "07"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, "Q5", "08"));
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.M100格拉默车型对应生产线, DicTypeName.M100格拉默车型对应生产线));
await _dicItemRepository.InsertManyAsync(dicItemLst);
//R100派格车型对应生产线
//R100格拉默车型对应生产线
dicItemLst = new List<DicItem>();
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100派格车型对应生产线, "Q5", "02"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100派格车型对应生产线, "B9", "03"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100派格车型对应生产线, "CC", "04"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100派格车型对应生产线, "B8L", "04"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100派格车型对应生产线, "C8", "05"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100派格车型对应生产线, "Q6", "07"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100派格车型对应生产线, "BSMV", "09"));
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.R100派格车型对应生产线, DicTypeName.R100派格车型对应生产线));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100格拉默车型对应生产线, "Q5", "02"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100格拉默车型对应生产线, "B9", "03"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100格拉默车型对应生产线, "CC", "04"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100格拉默车型对应生产线, "B8L", "04"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100格拉默车型对应生产线, "C8", "05"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100格拉默车型对应生产线, "Q6", "07"));
dicItemLst.Add(new DicItem(_guidGenerator.Create(), DicTypeName.R100格拉默车型对应生产线, "BSMV", "09"));
await _dicTypeRepository.InsertAsync(new DicType(_guidGenerator.Create(), DicTypeName.R100格拉默车型对应生产线, DicTypeName.R100格拉默车型对应生产线));
await _dicItemRepository.InsertManyAsync(dicItemLst);
////M100生产线
//dicItemLst = new List<DicItem>();

8
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Services/DicDomainService.cs
View File

@ -39,13 +39,13 @@ namespace WY.NewJit.MsgBaseData
{
public const string 报文车型 = "报文车型";
public const string 派格车型 = "派格车型";
public const string 格拉默车型 = "格拉默车型";
public const string 报文车型对应派格车型 = "报文车型对应派格车型";
public const string 报文车型对应格拉默车型 = "报文车型对应格拉默车型";
public const string R100派格车型对应生产线 = "R100派格车型对应生产线";
public const string R100格拉默车型对应生产线 = "R100格拉默车型对应生产线";
public const string M100派格车型对应生产线 = "M100派格车型对应生产线";
public const string M100格拉默车型对应生产线 = "M100格拉默车型对应生产线";
public const string R100生产线 = "R100生产线";

12
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/CacheManagerDomainService.cs
View File

@ -67,17 +67,17 @@ namespace WY.NewJit.MsgCheck
public static List<PartSwitch> _partSwitchList = new List<PartSwitch>();
/// <summary>
/// 报文车型对应派格车型
/// 报文车型对应格拉默车型
/// </summary>
public static List<DicItem> _msgToPaiGeVehicleModelList = new List<DicItem>();
/// <summary>
/// R100派格车型对应生产线
/// R100格拉默车型对应生产线
/// </summary>
public static List<DicItem> _r100VehicleModelProductLineList = new List<DicItem>();
/// <summary>
/// M100派格车型对应生产线
/// M100格拉默车型对应生产线
/// </summary>
public static List<DicItem> _m100VehicleModelProductLineList = new List<DicItem>();
@ -277,9 +277,9 @@ namespace WY.NewJit.MsgCheck
_erp2partList = _newJitDapperRepository.GetListBySql<AssemblyCfgErp2Part>(erp2partSql, true);
}
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应派格车型);
_r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100派格车型对应生产线);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100派格车型对应生产线);
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应格拉默车型);
_r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100格拉默车型对应生产线);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100格拉默车型对应生产线);
_logger.LogDebug("重新刷新报文解析缓存！");
}

254
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100CheckDomainService.cs
View File

@ -695,13 +695,13 @@ namespace WY.NewJit.MsgCheck
}
else
{
CompareErpAssemblyResult erpResult = CompareErpAssembly(m100Bill);
if (erpResult.IsMatch == true)
{
ret.ErpAssemblyResult = erpResult;
ret.VehicleModel = m100Bill.VehicleModelCode;
return ret;
}
//CompareErpAssemblyResult erpResult = CompareErpAssembly(m100Bill);
//if (erpResult.IsMatch == true)
//{
// ret.ErpAssemblyResult = erpResult;
// ret.VehicleModel = m100Bill.VehicleModelCode;
// return ret;
//}
}
#endregion
@ -853,112 +853,112 @@ namespace WY.NewJit.MsgCheck
/// </summary>
/// <param name="m100Bill"></param>
/// <returns>匹配的若干个Erp总成ID</returns>
private CompareErpAssemblyResult CompareErpAssembly(BillM100 m100Bill)
{
try
{
CompareErpAssemblyResult ret = new CompareErpAssemblyResult();
# region 单据零件转换成PartBase(排除柱护板)
List<PartBase> billPartBaseLst = new List<PartBase>();
List<BillM100Part> tempPartLst = m100Bill.BillM100Parts;
if (ConfigDic.CurrentVersion == ConfigDicVersionOption.派格)
{
tempPartLst = m100Bill.BillM100Parts.Where(itm => itm.PartType != "2").ToList(); //不等于柱护板
}
//按PartCode分组汇总PartNum
var qry2 = from item in tempPartLst
group item by item.PartCode into g
select new
{
PartCode = g.Key,
PartNum = g.Sum(itm => itm.PartNum)
};
foreach (var item in qry2)
{
PartBase gpObj = new PartBase(item.PartCode, item.PartNum);
billPartBaseLst.Add(gpObj);
}
#endregion
#region 进一步过滤ERP总成
//1.按车型过滤
//2.遍历所有Erp总成中的结算件，判断是不是单据中结算件的子集？
List<Guid> filterErpAssemblyIdLst = new List<Guid>();
List<string> billPartCodeLst = billPartBaseLst.Select(itm => itm.PartCode).ToList();
foreach (ErpAssemblyMain erpMainObj in _erpAssemblyMainList)
{
if (erpMainObj.VehicleModel.IsNullOrEmpty() || erpMainObj.VehicleModel == m100Bill.VehicleModelCode) //按车型过滤 或空
{
List<string> erpPartCodeLst = _erp2partList.Where(itm => itm.ErpAssemblyId == erpMainObj.Id).Select(itm => itm.PartCode).ToList();
bool isSubset = !erpPartCodeLst.Except(billPartCodeLst).Any(); //是子集
if (isSubset)
{
filterErpAssemblyIdLst.Add(erpMainObj.Id);
}
}
}
#endregion
int cnt = this.ParseAssemblyCycleCount;
_logger.LogDebug(_errorMessagePrefix + "_parseAssemblyCycleCount:" + cnt + ", filterErpAssemblyIdLst:" + filterErpAssemblyIdLst.Count());
for (int i = cnt; i > 0; i--)
{
List<Guid[]> combLst = PermutationAndCombination<Guid>.GetCombination(filterErpAssemblyIdLst.ToArray(), i); //求全部的 n*n 组合
if (combLst == null)
{
continue;
}
foreach (Guid[] combItm in combLst)
{
#region ERP总成转换成PartBase
List<Guid> erpIdLst = combItm.ToList();
//按PartCode分组汇总PartNum
var query = from item in _erp2partList
where erpIdLst.Contains(item.ErpAssemblyId)
group item by item.PartCode into g
select new
{
PartCode = g.Key,
PartNum = g.Sum(itm => itm.PartNum)
};
List<PartBase> erpPartBaseLst = new List<PartBase>();
foreach (var item in query)
{
PartBase tempObj = new PartBase(item.PartCode, item.PartNum);
erpPartBaseLst.Add(tempObj);
}
#endregion
bool isSame = ServerHelper.CompareTwoCollection(billPartBaseLst, erpPartBaseLst);
if (isSame) //已匹配
{
ret.ErpAssemblyIdList = erpIdLst;
//为了在调用方法中将整车总成添加到内存
List<AssemblyCfgVehicle2Part> vehicle2PartLst = new List<AssemblyCfgVehicle2Part>();
foreach (var groupItm in erpPartBaseLst)
{
AssemblyCfgVehicle2Part vehicle2PartObj = new AssemblyCfgVehicle2Part();
vehicle2PartObj.PartCode = groupItm.PartCode;
vehicle2PartObj.PartNum = groupItm.PartNum;
vehicle2PartLst.Add(vehicle2PartObj);
}
ret.Vehicle2PartList = vehicle2PartLst;
ret.IsMatch = true;
return ret;
}
}
}
ret.IsMatch = false;
return ret;
}
catch (Exception ex)
{
throw new Exception($"-CompareErpAssembly子方法-{_billNumber}-" + ex.Message);
}
}
//private CompareErpAssemblyResult CompareErpAssembly(BillM100 m100Bill)
//{
// try
// {
// CompareErpAssemblyResult ret = new CompareErpAssemblyResult();
// # region 单据零件转换成PartBase(排除柱护板)
// List<PartBase> billPartBaseLst = new List<PartBase>();
// List<BillM100Part> tempPartLst = m100Bill.BillM100Parts;
// if (ConfigDic.CurrentVersion == ConfigDicVersionOption.派格)
// {
// tempPartLst = m100Bill.BillM100Parts.Where(itm => itm.PartType != "2").ToList(); //不等于柱护板
// }
// //按PartCode分组汇总PartNum
// var qry2 = from item in tempPartLst
// group item by item.PartCode into g
// select new
// {
// PartCode = g.Key,
// PartNum = g.Sum(itm => itm.PartNum)
// };
// foreach (var item in qry2)
// {
// PartBase gpObj = new PartBase(item.PartCode, item.PartNum);
// billPartBaseLst.Add(gpObj);
// }
// #endregion
// #region 进一步过滤ERP总成
// //1.按车型过滤
// //2.遍历所有Erp总成中的结算件，判断是不是单据中结算件的子集？
// List<Guid> filterErpAssemblyIdLst = new List<Guid>();
// List<string> billPartCodeLst = billPartBaseLst.Select(itm => itm.PartCode).ToList();
// foreach (ErpAssemblyMain erpMainObj in _erpAssemblyMainList)
// {
// if (erpMainObj.VehicleModel.IsNullOrEmpty() || erpMainObj.VehicleModel == m100Bill.VehicleModelCode) //按车型过滤 或空
// {
// List<string> erpPartCodeLst = _erp2partList.Where(itm => itm.ErpAssemblyId == erpMainObj.Id).Select(itm => itm.PartCode).ToList();
// bool isSubset = !erpPartCodeLst.Except(billPartCodeLst).Any(); //是子集
// if (isSubset)
// {
// filterErpAssemblyIdLst.Add(erpMainObj.Id);
// }
// }
// }
// #endregion
// int cnt = this.ParseAssemblyCycleCount;
// _logger.LogDebug(_errorMessagePrefix + "_parseAssemblyCycleCount:" + cnt + ", filterErpAssemblyIdLst:" + filterErpAssemblyIdLst.Count());
// for (int i = cnt; i > 0; i--)
// {
// List<Guid[]> combLst = PermutationAndCombination<Guid>.GetCombination(filterErpAssemblyIdLst.ToArray(), i); //求全部的 n*n 组合
// if (combLst == null)
// {
// continue;
// }
// foreach (Guid[] combItm in combLst)
// {
// #region ERP总成转换成PartBase
// List<Guid> erpIdLst = combItm.ToList();
// //按PartCode分组汇总PartNum
// var query = from item in _erp2partList
// where erpIdLst.Contains(item.ErpAssemblyId)
// group item by item.PartCode into g
// select new
// {
// PartCode = g.Key,
// PartNum = g.Sum(itm => itm.PartNum)
// };
// List<PartBase> erpPartBaseLst = new List<PartBase>();
// foreach (var item in query)
// {
// PartBase tempObj = new PartBase(item.PartCode, item.PartNum);
// erpPartBaseLst.Add(tempObj);
// }
// #endregion
// bool isSame = ServerHelper.CompareTwoCollection(billPartBaseLst, erpPartBaseLst);
// if (isSame) //已匹配
// {
// ret.ErpAssemblyIdList = erpIdLst;
// //为了在调用方法中将整车总成添加到内存
// List<AssemblyCfgVehicle2Part> vehicle2PartLst = new List<AssemblyCfgVehicle2Part>();
// foreach (var groupItm in erpPartBaseLst)
// {
// AssemblyCfgVehicle2Part vehicle2PartObj = new AssemblyCfgVehicle2Part();
// vehicle2PartObj.PartCode = groupItm.PartCode;
// vehicle2PartObj.PartNum = groupItm.PartNum;
// vehicle2PartLst.Add(vehicle2PartObj);
// }
// ret.Vehicle2PartList = vehicle2PartLst;
// ret.IsMatch = true;
// return ret;
// }
// }
// }
// ret.IsMatch = false;
// return ret;
// }
// catch (Exception ex)
// {
// throw new Exception($"-CompareErpAssembly子方法-{_billNumber}-" + ex.Message);
// }
//}
/// <summary>
/// ERP总成比较【派格版】
@ -1023,20 +1023,20 @@ namespace WY.NewJit.MsgCheck
}
else //执行零件切换
{
foreach (var item in query)
{
PartSwitch psObj = partSwitchListByBillFilter.FirstOrDefault(itm => itm.SourcePartCode == item.PartCode);
if (psObj != null)
{
PartBase obj = new PartBase(psObj.TargetPartCode, item.PartNum); //根据切换关系表，将总成的零件，从源零件替换成目标零件
erpPartBaseLst.Add(obj);
}
else
{
PartBase obj = new PartBase(item.PartCode, item.PartNum);
erpPartBaseLst.Add(obj);
}
}
//foreach (var item in query)
//{
// PartSwitch psObj = partSwitchListByBillFilter.FirstOrDefault(itm => itm.SourcePartCode == item.PartCode);
// if (psObj != null)
// {
// PartBase obj = new PartBase(psObj.TargetPartCode, item.PartNum); //根据切换关系表，将总成的零件，从源零件替换成目标零件
// erpPartBaseLst.Add(obj);
// }
// else
// {
// PartBase obj = new PartBase(item.PartCode, item.PartNum);
// erpPartBaseLst.Add(obj);
// }
//}
}
#endregion

2
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.BomInterface/Services/SyncAssemblyService.cs
View File

@ -731,7 +731,7 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
//取WMS数据（分为增、删、改三部分；每部分分为分组、总成、子零件三级)
WmsInterfaceData wmsDatas = GetWmsGroupData(takeRecCnt);
List<DicItem> vehicleModelLst = _dicDomainService.GetDicItems(DicTypeName.派格车型);
List<DicItem> vehicleModelLst = _dicDomainService.GetDicItems(DicTypeName.格拉默车型);
//取FIS总成数据（分为分组、总成、子零件三级）
List<AssemblyCfgGroupDto> allFisGroupLst = GetFisGroupData();
//同步新增BOM

6
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.BomInterface/appsettings.json
View File

@ -16,10 +16,10 @@
},
"ConnectionStrings": {
"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",
"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;"
},

10
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/Messages/MsgTransmissionService.cs
View File

@ -488,7 +488,7 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
join FisAssemblyCfgPart ep on e.Id = ep.AssemblyCfgErpId
where ep.PartCode is not null
and not exists (select PartCode from FisPartCfg pc where IsDisable = 1 and ep.PartCode = pc.PartCode)
and ep.PartCode in (select distinct RelationKey from FisMaterialExt where MaterialGroup like '72%')
/*and ep.PartCode in (select distinct RelationKey from FisMaterialExt where MaterialGroup like '72%')*/
";
erp2partList = _newJitDapperRepository.GetListBySql<AssemblyCfgErp2Part>(erp2partSql, true);
@ -513,9 +513,9 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
_r100CheckDomainSrv.InitPub(vehicleAssemblyIdList, vehicle2partList, erpAssemblyMainList, erp2partList, _partSwitchList); //整车总成内存及时刷新， ERP总成增删改时触发刷新标志
_m100CheckDomainService.InitPub(vehicleAssemblyIdList, vehicle2partList, erpAssemblyMainList, erp2partList, _partSwitchList);
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应派格车型);
_r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100派格车型对应生产线);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100派格车型对应生产线);
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应格拉默车型);
_r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100格拉默车型对应生产线);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100格拉默车型对应生产线);
_logger.LogDebug("重新刷新报文解析缓存！");
}
@ -922,7 +922,7 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
_logger.LogError(errorMsg);
}
}
else //报文车型 没有对应的 派格车型
else //报文车型 没有对应的 格拉默车型
{
SetProductLineByExcept(bill);
string errorMsg = $"报文车型{ediVehicleModel}没有对应的零件生产工厂车型！";

8
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/appsettings.json
View File

@ -60,11 +60,11 @@
},
"ConnectionStrings": {
/*"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_0114;uid=sa;pwd=Microsoft2008;",*/
"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
/*"Default": "Server=192.168.1.228;Database=NewJitPG_TEST_0114;uid=sa;pwd=ChangkeTec@2021;",*/
"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",
/*"Default": "Server=192.168.0.216;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",*/
"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;"
},
/*

6
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/Services/FileParse.cs
View File

@ -403,8 +403,8 @@ namespace WY.NewJit.Job.ConsoleBatchImportBrokenNum.Services
_m100CheckDomainService.InitPub(vehicleAssemblyIdList, vehicle2partList, erpAssemblyMainList, erp2partList, _partSwitchList);//整车总成内存及时刷新， ERP总成增删改时触发刷新标志
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应派格车型);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100派格车型对应生产线);
_msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应格拉默车型);
_m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100格拉默车型对应生产线);
_logger.LogDebug("重新刷新报文解析缓存！");
}
@ -510,7 +510,7 @@ namespace WY.NewJit.Job.ConsoleBatchImportBrokenNum.Services
_logger.LogError(errorMsg);
}
}
else //报文车型 没有对应的 派格车型
else //报文车型 没有对应的 格拉默车型
{
SetProductLineByExcept(billObj);
string errorMsg = $"报文车型{ediVehicleModel}没有对应的零件生产工厂车型！VIN={billObj.VIN}【不终止错误】";

8
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/appsettings.Development.json
View File

@ -33,12 +33,12 @@
},
"ConnectionStrings": {
/*"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_0114;uid=sa;pwd=Microsoft2008;",*/
//"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
/*"Default": "Server=192.168.1.228;Database=NewJitPG_TEST_0114;uid=sa;pwd=ChangkeTec@2021;",*/
//"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",
"Default": "Server=dev.ccwin-in.com,13326;Database=NewJitPG;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;"
},
"AuthServer": {

8
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleBatchImportBrokenNum/appsettings.json
View File

@ -33,10 +33,10 @@
},
"ConnectionStrings": {
/*"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_0114;uid=sa;pwd=Microsoft2008;",*/
"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
/*"Default": "Server=192.168.1.228;Database=NewJitPG_TEST_0114;uid=sa;pwd=ChangkeTec@2021;",*/
"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",
"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;"
},
"AuthServer": {

12
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/Messages/MsgTransmissionService.cs
View File

@ -119,17 +119,17 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
#region 缓存
/// <summary>
/// 报文车型对应派格车型
/// 报文车型对应格拉默车型
/// </summary>
private static List<DicItem> _msgToPaiGeVehicleModelList = new List<DicItem>();
/// <summary>
/// R100派格车型对应生产线
/// R100格拉默车型对应生产线
/// </summary>
private static List<DicItem> _r100VehicleModelProductLineList = new List<DicItem>();
/// <summary>
/// M100派格车型对应生产线
/// M100格拉默车型对应生产线
/// </summary>
private static List<DicItem> _m100VehicleModelProductLineList = new List<DicItem>();
@ -397,9 +397,9 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
// _r100CheckDomainSrv.InitPub(vehicleAssemblyIdList, vehicle2partList, erpAssemblyMainList, erp2partList); //整车总成内存及时刷新， ERP总成增删改时触发刷新标志
// _m100CheckDomainService.InitPub(vehicleAssemblyIdList, vehicle2partList, erpAssemblyMainList, erp2partList);
// _msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应派格车型);
// _r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100派格车型对应生产线);
// _m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100派格车型对应生产线);
// _msgToPaiGeVehicleModelList = _dicDomainService.GetDicItems(DicTypeName.报文车型对应格拉默车型);
// _r100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.R100格拉默车型对应生产线);
// _m100VehicleModelProductLineList = _dicDomainService.GetDicItems(DicTypeName.M100格拉默车型对应生产线);
//}
//[UnitOfWork]

10
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleGetEDIFile/appsettings.json
View File

@ -1,7 +1,7 @@
{
"App": {
"SelfUrl": "http://localhost:44344",
"CorsOrigins": "https://*.abc.com,http://localhost:9528,http://192.168.0.140:8101,http://localhost:44344/,http://localhost:44344/*,http://localhost:44344/swagger/index.html"
"CorsOrigins": "https://*.abc.com,http://localhost:9528,http://192.168.1.228:8101,http://localhost:44344/,http://localhost:44344/*,http://localhost:44344/swagger/index.html"
},
"ConfigDic": {
@ -46,9 +46,9 @@
},
"ConnectionStrings": {
"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",
"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;"
},
@ -66,7 +66,7 @@
"GrantType": "client_credentials",
"ClientId": "business-app",
"ClientSecret": "1q2w3e*",
"Authority": "http://192.168.0.140:8101",
"Authority": "http://192.168.1.228:8101",
"Scope": "InternalGateway IdentityService SettleAccount"
}
},

2
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleMoveFile/appsettings.json
View File

@ -11,7 +11,7 @@
"TakeFileCount": 20,
"SleepMilliSecond": 0,
//"SourcePath": "\\\\192.168.0.140\\jis_rcv",
//"SourcePath": "\\\\192.168.1.228\\jis_rcv",
//"CopyTargetPath": "D:\\~LYF\\~源码\\通用FIS\\src\\Modules\\新版JIT或JIS系统服务端\\src\\WY.NewJit.Job.ConsoleMoveFile\\bin\\Debug\\net5.0\\JIS_WORK",
//"MoveTargetPath": "D:\\~LYF\\~源码\\通用FIS\\src\\Modules\\新版JIT或JIS系统服务端\\src\\WY.NewJit.Job.ConsoleMoveFile\\bin\\Debug\\net5.0\\JIS_WORK"
"SourcePath": "D:\\\\~all-publish\\\\MessageFile_Test\\SourceDir",

6
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleSyncToWms/appsettings.json
View File

@ -14,9 +14,9 @@
},
"ConnectionStrings": {
"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
"ABP": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",
"ABP": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;"
},

8
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/appsettings.json
View File

@ -6,10 +6,10 @@
"ConnectionStrings": {
//"NewJitPG": "Server=dev.ccwin-in.com,13326;Database=NewJitPG;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
//"Default": "Server=dev.ccwin-in.com,13326;Database=ABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
//"Default": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
"NewJitPG": "Server=192.168.0.140;Database=NewJitPG_TEST_20230703;uid=sa;pwd=Microsoft2008;",
"Default": "Server=192.168.0.140;Database=ABP;User ID=sa;Password=Microsoft2008;",
"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
//"Default": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",
"NewJitPG": "Server=192.168.1.228;Database=NewJitPG;uid=sa;pwd=ChangkeTec@2021;",
"Default": "Server=192.168.1.228;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
"WMS": "Server=192.168.1.228;Database=CPAT_WMS_TEST;User ID=sa;Password=ChangkeTec@2021;"
},
"AuthServer": {

2
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/wwwroot/static/js/chunk-5e9b71b5.b7142855.js
View File

File diff suppressed because one or more lines are too long

2
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/wwwroot/static/js/chunk-62062bae.7d0067f4.js
View File

File diff suppressed because one or more lines are too long

2
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/wwwroot/static/js/chunk-b83932fc.b52aee7c.js
View File

File diff suppressed because one or more lines are too long

2
Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/wwwroot/static/js/chunk-de0cc00c.ef5d3286.js
View File

File diff suppressed because one or more lines are too long

BIN
Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg
View File

Binary file not shown.

BIN
Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll
View File

Binary file not shown.

BIN
Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb
View File

Binary file not shown.

BIN
Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll
View File

Binary file not shown.

BIN
Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb
View File

Binary file not shown.

2
Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec
View File

@ -5,7 +5,7 @@
<version>2.0.0</version>
<authors>Win.Sfs.Shared</authors>
<description>Package Description</description>
<repository type="git" />
<repository type="git" commit="2092a38cbb13c5193009595ba12aecd716ddc879" />
<dependencies>
<group targetFramework="net5.0">
<dependency id="Win.Utils" version="2.0.0" exclude="Build,Analyzers" />

2
Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Win.Sfs.Shared")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+2092a38cbb13c5193009595ba12aecd716ddc879")]
[assembly: System.Reflection.AssemblyProductAttribute("Win.Sfs.Shared")]
[assembly: System.Reflection.AssemblyTitleAttribute("Win.Sfs.Shared")]
[assembly: System.Reflection.AssemblyVersionAttribute("2.0.0.0")]

2
Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.AssemblyInfoInputs.cache
View File

@ -1 +1 @@
4a725e723e769ac9de8f0aec43d8f7a66bce66d75844e12c14898e748a093244
6d2fe8ec5bc907c024a5ddabfd324b4824f304459352f78a7d89e3d9cfbe6252

BIN
Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll
View File

Binary file not shown.

BIN
Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb
View File

Binary file not shown.

BIN
Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll
View File

Binary file not shown.

BIN
Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll
View File

Binary file not shown.

BIN
Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg
View File

Binary file not shown.

BIN
Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll
View File

Binary file not shown.

BIN
Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb
View File

Binary file not shown.

2
Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec
View File

@ -5,7 +5,7 @@
<version>2.0.0</version>
<authors>Win.Utils</authors>
<description>Package Description</description>
<repository type="git" />
<repository type="git" commit="2092a38cbb13c5193009595ba12aecd716ddc879" />
<dependencies>
<group targetFramework="net5.0">
<dependency id="NPOI" version="2.5.2" exclude="Build,Analyzers" />

2
Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Win.Utils")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0+2092a38cbb13c5193009595ba12aecd716ddc879")]
[assembly: System.Reflection.AssemblyProductAttribute("Win.Utils")]
[assembly: System.Reflection.AssemblyTitleAttribute("Win.Utils")]
[assembly: System.Reflection.AssemblyVersionAttribute("2.0.0.0")]

2
Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.AssemblyInfoInputs.cache
View File

@ -1 +1 @@
75c76c4b1eea5bc44938ab8179e7b6a6088da564d5fc0732469ed7fb00485f30
a97332eadfccd04ca5a3d2e104ed3aa27eb952b00af14d48bb16c021e7e8e0e6

BIN
Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll
View File

Binary file not shown.

BIN
Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb
View File

Binary file not shown.

BIN
Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll
View File

Binary file not shown.

BIN
Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save