diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index b0b17c6b..d1d970c1 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index be05e825..c9aa0b30 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1 @@ -9eb9c3343bb1a3a8e3426fc92f4e398af1f4cb1ade520efc3416cbca1a18e1cd +09e70017c9bba340185d279a719dbcbda4ae15b3c3762baa2bc1b80903fb62bd diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index 35262ee2..4fdaa4af 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index 6ab3f5a9..a6bd9c9b 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1 @@ -a165af674a441087eb22ae19c77f979a6da84cbec6e5cbc681f8782efbaf2a96 +62c372c21881cc0a3cf18ed9ccd3281daa887a1a4ca7f4ee3d294ea0404fcb2b diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index 9e118d78..d909ad3d 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index 0b4b5cc1..3431a022 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -50db5bdaed5a2e50771f8e9b59e9015f322c4f69836771d4f10280033baddf0f +19d97d4aad1e5f6c727e3cec4adacff61b3a7c7bd32d69c8972a032c9273ee13 diff --git a/Admin.Core.IRepository/IRepository_New/IRecordInstoreRepository.cs b/Admin.Core.IRepository/IRepository_New/IRecordInstoreRepository.cs index be153ebd..d48d6b5a 100644 --- a/Admin.Core.IRepository/IRepository_New/IRecordInstoreRepository.cs +++ b/Admin.Core.IRepository/IRepository_New/IRecordInstoreRepository.cs @@ -10,5 +10,6 @@ namespace Admin.Core.IRepository public interface IRecordInStoreRepository : IBaseRepository { Task SaveRecordToDb(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail); + Task SaveRecord(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail); } } \ No newline at end of file diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index bfea24f4..a1618282 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index 45d9113b..0ecfe896 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1 @@ -340b53e9f3980b2f035b259b8c24855db503861dc7ce044dd8125b484ea52e3e +f1bcb3e30d597461cd7b4a6e828ff284b1b41e27582d847c26cbc7fdb28431c0 diff --git a/Admin.Core.IService/IService_New/IRecordInstoreServices.cs b/Admin.Core.IService/IService_New/IRecordInstoreServices.cs index 8b39b15e..2a2726b1 100644 --- a/Admin.Core.IService/IService_New/IRecordInstoreServices.cs +++ b/Admin.Core.IService/IService_New/IRecordInstoreServices.cs @@ -28,5 +28,12 @@ namespace Admin.Core.IService /// 结束时间 /// 入库记录集合 Task> queryRecordToDb(string storeCode,DateTime startTime, DateTime endTime); + /// + /// 泡前库货道信息更新 + /// + /// + /// + /// + Task SaveRecord(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail); } } \ No newline at end of file diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index 8a4a8a1d..2c9738ef 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index 7f97ca7c..654a85c4 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1 +1 @@ -1771f1e0c2289705e94aa4abfed5bb91ff856e44a3ad0211a3208ce94b3dc6ec +0d0764005bd65b273c0508565a549cd7307506af4e8920b4795d4d8f39986518 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index 929eeaac..065b5fd4 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index d3ae850e..ffb5b16b 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -9068062e57a5b81a7148289fc74572e59369ccf4ef2cbf765ccb11dfb12a171b +5773f152df26b95087e08348c9bda19c1be708fc03119089543692f612cbff29 diff --git a/Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs b/Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs index 04667a8a..f2cd6962 100644 --- a/Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs +++ b/Admin.Core.Repository/Repository_New/RecordInstoreRepository.cs @@ -24,8 +24,8 @@ namespace Admin.Core.Repository Db.CopyNew().Deleteable(realTask).ExecuteCommand(); Db.CopyNew().Updateable(baseSpaceInfo).ExecuteCommand(); Db.CopyNew().Insertable(store).ExecuteCommand(); - // 不控制出库，没必要添加货道明细 - // Db.Insertable(baseDetail).ExecuteCommand(); + // 不控制出库，没必要添加货道明细 + Db.Insertable(baseDetail).ExecuteCommand(); Db.CopyNew().Ado.CommitTran(); return true; } @@ -37,6 +37,27 @@ namespace Admin.Core.Repository } } - + public async Task SaveRecord(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail) + { + try + { + + Db.CopyNew().Ado.BeginTran(); + Db.CopyNew().Deleteable(realTask).ExecuteCommand(); + Db.CopyNew().Updateable(baseSpaceInfo).ExecuteCommand(); + Db.CopyNew().Insertable(store).ExecuteCommand(); + // 不控制出库，没必要添加货道明细 + //Db.Insertable(baseDetail).ExecuteCommand(); + Db.CopyNew().Ado.CommitTran(); + return true; + } + catch (Exception ex) + { + await Db.CopyNew().Ado.RollbackTranAsync(); + logHelper.Error($"箱体入库更新异常:{ex.Message}"); + return false; + } + } + } } \ No newline at end of file diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index 022e0d81..f3b9eb79 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index fe744fe3..50791828 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1 +1 @@ -093f57870764331d57de6cafb70e8f3a16edeae5233ad8a1eddbd307df44fba2 +71714e5e63310566fa090718f0555bff735e2e784a813bbab00e8f701d48c3b3 diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index d30ad5a1..aaa1fdfb 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index 2b18ca62..6a29dee9 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1 +1 @@ -ec73500b8c3ed36309792e9a99c4baf2dda48b653bd87333e427a308f0235421 +ce41c6807cfbdb8eff45c5405f4984b42d6d923756e6e213836d5b9c510a3e3c diff --git a/Admin.Core.Service/Service_New/RecordInstoreServices.cs b/Admin.Core.Service/Service_New/RecordInstoreServices.cs index 8e0b7f5f..f379cf10 100644 --- a/Admin.Core.Service/Service_New/RecordInstoreServices.cs +++ b/Admin.Core.Service/Service_New/RecordInstoreServices.cs @@ -36,7 +36,18 @@ namespace Admin.Core.Service { return await _recordInstoreRepository.SaveRecordToDb(store, realTask, baseSpaceInfo, baseDetail); } - + /// + /// 更新货道信息、入库记录、实时任务 + /// + /// + /// + /// + /// + public async Task SaveRecord(RecordInStore store, RealTaskInfo realTask, BaseSpaceInfo baseSpaceInfo, BaseSpaceDetail baseDetail) + { + return await _recordInstoreRepository.SaveRecord( store, realTask, baseSpaceInfo, baseDetail); + } + /// /// 查询入库记录 /// diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index 59925beb..e10ae182 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index cf000f5a..d33b9a05 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -684ec858c0135ef17a23f6f4ba9440db1d8c00ab0db171f9b67e882bc38e153d +51f44909201dbd9241b4779a73b8b672cb1f3a748f196d413168252d62b5138c diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index 37651009..bd722543 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index 4023e6be..ff7790e4 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1 +1 @@ -bc3b83989d0a9bbe7fbe3b0dd43a98d703c9202d722100e83165ea0560759ef7 +2906f3a415f186cbcb70496e9279b2f10c55fe29e20ba6540a209d684a48975e diff --git a/Aucam.Core.TemperatureService/appsettings.json b/Aucam.Core.TemperatureService/appsettings.json index d994d159..df15223a 100644 --- a/Aucam.Core.TemperatureService/appsettings.json +++ b/Aucam.Core.TemperatureService/appsettings.json @@ -157,7 +157,7 @@ "ConnectionString": "127.0.0.1:6379" }, "Common": { - "TemperatureApiAddRess": "http://10.100.72.10:8080" + "StationName": "2009" }, "RabbitMQ": { "Enabled": true, diff --git a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs index f9d9dd94..9686c6e1 100644 --- a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs +++ b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs @@ -16,6 +16,7 @@ using NetTaste; using System.Windows.Media.Media3D; using System.Windows.Forms; using Admin.Core.Model.Model_New; +using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData; namespace Aucma.Core.BoxFoam.Business { @@ -76,6 +77,12 @@ namespace Aucma.Core.BoxFoam.Business public delegate void LogDelegate(string msg); public static event LogDelegate LogDelegateEvent; + /// + /// 库存信息 + /// + /// + public delegate void RefreshPageDelegate(); + public static event RefreshPageDelegate RefreshPageDelegateEvent; #endregion private string storeCode = string.Empty; @@ -111,12 +118,12 @@ namespace Aucma.Core.BoxFoam.Business { MvCodeHelper.PQKReceiveCodeEvent += NewTask; storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code - - #region 入库任务 - Task.Run(async () => - { - await InitEnterStore(); - }); + + #region 更新库数据 + Task.Run(async () => + { + await RealTimeUpdateStore(); + }); #endregion } @@ -136,231 +143,134 @@ namespace Aucma.Core.BoxFoam.Business Console.WriteLine($"【{DateTime.Now}】未扫到二维码信息,请重新扫码！"); return; } - - string materialCode = SubString(materialBarCode); + bool flag = true; //创建入库任务 Console.WriteLine($"【{DateTime.Now}】扫码成功，物料条码：{materialBarCode}"); logHelper.Info($"扫码成功，物料条码：{materialBarCode}"); LogDelegateEvent?.Invoke($"扫码成功，物料条码：{materialBarCode}"); - var taskList = await _realTaskInfoService.QueryAsync(d=>d.StoreCode== storeCode); - if (taskList.Count() > 0) - { - //如果存在多条物料任务删除重新创建 - taskList.ForEach(d=>d.TaskStatus= 3); - _ = _realTaskInfoService.UpdateAsync(taskList).Result; - } - var result = await CreateRecordTask(materialBarCode); //创建入库任务 - if (result) - { - Console.WriteLine($"【{DateTime.Now}】物料条码：{materialBarCode},创建任务成功！"); - } - - await Task.CompletedTask; - } - #region 创建入库任务 - /// - /// 创建入库任务 - /// - /// 物料条码 - private async Task CreateRecordTask(string materialBarCode) - { - bool result = false; - try + #region 执行任务 + string materialCode = SubString(materialBarCode); + var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("PqPlc")); + if (obj != null) { - //生成入库任务 - RealTaskInfo realTaskInfo = new RealTaskInfo(); - realTaskInfo.TaskType = 1; - realTaskInfo.TaskCode = System.Guid.NewGuid().ToString("N").Substring(0, 6); - realTaskInfo.MaterialCode = materialBarCode;//存储物料条码 - realTaskInfo.PlanAmount = 1; - realTaskInfo.TaskStatus = 1; //任务状态：1 - 待执行；2 - 执行中；3 - 完成 - realTaskInfo.CreateTime = DateTime.Now; - realTaskInfo.StoreCode = storeCode; - int flag = await _realTaskInfoService.AddAsync(realTaskInfo); - if (flag > 0) - { - logHelper.Info("入库任务创建成功"); - LogDelegateEvent?.Invoke($"[{materialBarCode}]入库任务创建成功"); - RefreshInStoreTaskEvent?.Invoke(realTaskInfo);//刷新datagrid 列表 - result = true; - } - else + if (obj.plc.IsConnected) { - logHelper.Info("入库任务创建失败"); - LogDelegateEvent?.Invoke($"[{materialBarCode}]入库任务创建失败"); - result = false; + if (flag) + { + flag = false; + try + { + LogDelegateEvent?.Invoke($"获取物料编码：{materialCode}"); + Console.WriteLine($"获取物料编码：{materialCode}"); + bool r= obj.plc.WriteString("DB200.132", materialCode);//写入物料号 + Console.WriteLine($"写入物料编码：{r}"); + if (r) + { + //更新货道入库 + await EnterStore(materialBarCode); + //更新过点数 + await UpdateComplete(materialBarCode); + Console.WriteLine($"更新物料信息成功！"); + } + else + { + Console.WriteLine($"向PLC写入物料编码失败！"); + } + } + catch (Exception ex) + { + logHelper.Error($"入库业务异常:{ex}"); + LogDelegateEvent?.Invoke($"入库业务异常:{ex}"); + Console.WriteLine($"入库业务异常：{ex.Message}"); + } + finally + { + flag = true; + } + } } } - catch (Exception ex) - { - logHelper.Info($"入库任务创建异常：{ex.Message}"); - result = false; - } - return result; - } - - #endregion - #endregion - - #region 任务执行入库 - public async Task EnterStore(string barCode, int store) - { - //获取货道详情 - string spaceCode = string.Empty; - switch (store) - { - case 1: - spaceCode = "PB01_001"; - break; - case 2: - spaceCode = "PB01_002"; - break; - case 3: - spaceCode = "PB01_003"; - break; - case 4: - spaceCode = "PB01_004"; - break; - case 5: - spaceCode = "PB01_005"; - break; - case 6: - spaceCode = "PB01_006"; - break; - default: - break; - } - if (string.IsNullOrEmpty(spaceCode)) return; - var baseStoreInfo = await _baseStoreInfoServices.FirstAsync(d => d.StoreCode.Equals(storeCode));//仓库 - var baseSpace = await _baseSpaceInfoServices.FirstAsync(d => d.SpaceCode.Equals(spaceCode)); - //入库记录表 - - //根据条码获取物料详情 - var material = _printBarCodeServices.FirstAsync(d => d.MaterialBarcode == barCode).Result; - RecordInStore recordInstore = new RecordInStore(); - recordInstore.StoreCode = storeCode; - recordInstore.StoreArea = baseStoreInfo.StoreArea; - recordInstore.SpaceCode = baseSpace.SpaceCode; - string materialType = SubString(barCode);//截取中间物料条码 - recordInstore.MaterialType = materialType; - recordInstore.MaterialCode = material.MaterialCode; - recordInstore.InStoreTime = DateTime.Now; - recordInstore.BarCodeCode = barCode; - recordInstore.MaterialName = material.MaterialName; - recordInstore.EntryPattern = 0; - recordInstore.IsFlag = 0; - recordInstore.CreatedTime = DateTime.Now; - //入库详情表 - BaseSpaceDetail baseDetail = new BaseSpaceDetail(); - baseDetail.StoreCode = storeCode; - baseDetail.SpaceCode = baseSpace.SpaceCode; - baseDetail.MaterialCode = material.MaterialCode; - baseDetail.MaterialName = material.MaterialName; - baseDetail.MaterialAmount = 1; - baseDetail.CreatedTime = DateTime.Now; - - bool result = _recordInstoreServices.SaveRecordToDb(recordInstore, null, baseSpace, baseDetail).Result; - if (result) - { - string message = $"物料[{material.MaterialName}], 入{baseSpace.SpaceName},入库成功！"; - RefreshScanMateriaCodeEvent?.Invoke(material.MaterialCode, barCode, material.MaterialName, baseSpace.SpaceName, message); //刷新界面扫码信息 - LogDelegateEvent?.Invoke($"物料[{material.MaterialName}], 入库[{baseSpace.SpaceName}]成功！"); - RefreshDataGridDelegateEvent?.Invoke(); - } else { - LogDelegateEvent?.Invoke($"物料[{material.MaterialName}], 入库[{baseSpace.SpaceName}]失败，任务回滚！"); - logHelper.Error($"物料[{material.MaterialName}], 入库[{baseSpace.SpaceName}]失败，任务回滚！"); + Console.WriteLine("PLC连接中..."); + Thread.Sleep(3000); } + #endregion + await Task.CompletedTask; } - + #endregion - #region 执行入库任务 - public async Task InitEnterStore() + #region 更新库数 + public async Task RealTimeUpdateStore() { - RealTaskInfo realTaskInfo = null; - Thread.Sleep(3000); bool flag = true; - do + while (true) { - var taskList = await _realTaskInfoService.QueryAsync(d=>d.StoreCode== storeCode&&d.TaskStatus==1); - if (taskList == null || taskList.Count() == 0) continue; - - var taskTime = taskList.Max(d => d.CreateTime); - realTaskInfo = taskList.First(d => d.CreateTime == taskTime); - if (realTaskInfo==null) continue; - - #region 执行任务 - string materialCode = SubString(realTaskInfo.MaterialCode); - var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("PqPlc")); - if (obj != null) + try { - if (obj.plc.IsConnected) + if (flag) { - if (flag) + flag = false; + var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("PqPlc")); + if (obj != null) { - try + if (obj.plc.IsConnected) { - Thread.Sleep(1000); - flag = false; - LogDelegateEvent?.Invoke($"获取物料编码：{materialCode}"); - Console.WriteLine($"获取物料编码：{materialCode}"); - obj.plc.WriteString("DB200.132", materialCode); - int store = obj.plc.ReadInt16("DB200.438");//读取货道 - Console.WriteLine($"进入货道：{store}"); - if (store == 0) continue; - { - LogDelegateEvent?.Invoke($"物料编码：{materialCode},进入货道：{store}货道"); - bool r = obj.plc.WriteInt16("DB200.2", "1"); - Console.WriteLine($"写入应答字为：1，写入结果为：{r}"); - LogDelegateEvent?.Invoke($"写入应答字为：1，写入结果为：{r}"); - } + var storeList = await _baseSpaceInfoServices.QueryAsync(d => d.StoreCode == storeCode); + foreach (var item in storeList) { - LogDelegateEvent?.Invoke($"等待PLC入库完成信号...."); - int an = obj.plc.ReadInt16("DB200.86"); - if (an == 2) + switch (item.SpaceCode) + { + case "PB01_001": + item.SpaceStock= obj.plc.ReadInt16("DB200.440"); + item.OnRouteAmount = item.SpaceStock-obj.plc.ReadInt16("DB200.88"); + break; + case "PB01_002": + item.SpaceStock = obj.plc.ReadInt16("DB200.442"); + item.OnRouteAmount = item.SpaceStock - obj.plc.ReadInt16("DB200.90"); + break; + case "PB01_003": + item.SpaceStock = obj.plc.ReadInt16("DB200.444"); + item.OnRouteAmount = item.SpaceStock - obj.plc.ReadInt16("DB200.92"); + break; + case "PB01_004": + item.SpaceStock = obj.plc.ReadInt16("DB200.446"); + item.OnRouteAmount = item.SpaceStock - obj.plc.ReadInt16("DB200.94"); + break; + case "PB01_005": + item.SpaceStock = obj.plc.ReadInt16("DB200.448"); + item.OnRouteAmount = item.SpaceStock - obj.plc.ReadInt16("DB200.96"); + break; + case "PB01_006": + item.SpaceStock = obj.plc.ReadInt16("DB200.450"); + item.OnRouteAmount = item.SpaceStock - obj.plc.ReadInt16("DB200.98"); + break; + default: + break; + } + item.UpdatedTime = DateTime.Now; + bool r= await _baseSpaceInfoServices.UpdateAsync(item); + if (r) { - LogDelegateEvent?.Invoke($"物料入库完成,清空物料信息。"); - obj.plc.WriteString("DB200.132", ""); - obj.plc.WriteInt16("DB200.86", "0"); - - //任务完成更新任务状态 - realTaskInfo.TaskStatus = 3; - _ = _realTaskInfoService.UpdateAsync(realTaskInfo).Result; - //更新货道入库 - await EnterStore(realTaskInfo.MaterialCode, store); - //更新过点数 - await UpdateComplete(realTaskInfo.MaterialCode); - Console.WriteLine($"箱体入库成功！入库货道为：{store}货道"); - LogDelegateEvent?.Invoke($"箱体入库成功！入库货道为：{store}货道"); - RefreshInStoreTaskEvent?.Invoke(realTaskInfo);//刷新datagrid 列表 + Console.WriteLine("更新库存信息成功！"); } } - } - catch (Exception ex) - { - logHelper.Error($"入库业务异常:{ex}"); - LogDelegateEvent?.Invoke($"入库业务异常:{ex}"); - Console.WriteLine($"入库业务异常：{ex.Message}"); - } - finally - { - flag = true; + + //刷新库存信息 + RefreshPageDelegateEvent?.Invoke(); } } } + Thread.Sleep(1000); } - else + catch (Exception ex) { - Console.WriteLine("PLC连接中..."); - Thread.Sleep(3000); - continue; + Console.WriteLine($"异常：{ex.Message}"); } - #endregion - Thread.Sleep(1000); - } while (true); + finally { flag = true; } + } } #endregion @@ -391,378 +301,41 @@ namespace Aucma.Core.BoxFoam.Business #endregion + #region 任务执行入库 - - - #region 20240315之前 - - #region 初始化入库任务---模拟测试启用 - /// - /// 初始化入库任务 - /// - public async void init() - { - try - { - allSpaces = _baseSpaceInfoServices.Query(x => x.StoreCode == storeCode); - foreach (var space in allSpaces) - { - spaceAddresses.Add(spaceConfig.GetSpaceAddress(storeCode, space.SpaceCode)); - } - // 模拟入库 - //Task.Run(async () => - //{ - // Thread.Sleep(5000); - // await InStore("B24010183025024860011"); - //}); - //实时监测入库任务下发和入库任务完成 - StartPassDownAndRealInstoreFinish(); - } - catch (Exception ex) - { - logHelper.Info(ex.Message.ToString()); - Console.WriteLine($"初始化异常:{ex.Message}"); - } - } - #endregion - - #region 定时器实时监测入库出库完成信号 - /// - /// 定时器实时监测入库出库完成信号 - /// - /// - public void RealInstoreFinish() - { - var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc")); - if (obj != null && obj.plc.IsConnected) - { - foreach (SpaceAddress spaceAddress in spaceAddresses) - { - // 入库完成信号 - if (obj.plc.ReadInt16(spaceAddress.inStoreFinish) == 1) - { - obj.plc.WriteInt16(spaceAddress.inStoreFinish, "0"); - InStoreFinish(spaceAddress.spaceCode); - } - // 出库完成信号， - if (obj.plc.ReadInt16(spaceAddress.outStoreFinish) == 1) - { - obj.plc.WriteInt16(spaceAddress.outStoreFinish, "0"); - // 系统不控制出库，暂时未使用出库完成信号 - } - } - } - } - #endregion - - #region 实时监测入库任务下发和入库任务完成 - /// - ///实时监测入库任务下发和入库任务完成 - /// - public async void StartPassDownAndRealInstoreFinish() - { - Task.Run(() => - { - Thread.Sleep(3000); - while (true) - { - PassDown(); - Thread.Sleep(1000); - } - }); - Task.Run(() => - { - Thread.Sleep(3000); - while (true) - { - RealInstoreFinish(); - Thread.Sleep(1000); - } - }); - } - #endregion - - #region 获取入库任务下发plc - - /// - /// 获取入库任务下发plc - /// - /// - /// - public void PassDown() - { - try - { - RealTaskInfo taskInfo = GetAwaitSendTask(storeCode); - - if (taskInfo != null) - { - Console.WriteLine($"下发PLC:{taskInfo.ToJson()}"); - #region 测试 禁用PLC 入库先不做交互 - if (SendFoamTask_InStore(taskInfo)) - { - logHelper.Info($"泡前入库任务：{taskInfo.TaskCode}；下发成功，等待PLC执行反馈"); - semaphore.Wait(); //一直堵塞直到信号量释放 - logHelper.Info($"箱壳入库任务：{taskInfo.TaskCode}；开始执行"); - LogDelegateEvent?.Invoke($"箱壳入库任务：{taskInfo.TaskCode}；开始执行"); - taskInfo.TaskStatus = 2; - _realTaskInfoService.UpdateAsync(taskInfo); - - #region 更新在途数 - BaseSpaceInfo spaceInfo = _baseSpaceInfoServices.Query(x => x.StoreCode == taskInfo.StoreCode && x.SpaceCode == taskInfo.SpaceCode).FirstOrDefault(); - spaceInfo.OnRouteAmount += 1; - _baseSpaceInfoServices.UpdateSpaceInfo(spaceInfo); - #endregion - - RefreshDataGridDelegateEvent?.Invoke();//刷新datagrid 列表 - - //logHelper.Info($"泡后入库任务：{taskInfo.TaskCode}；执行完成"); - // 刷新入库任务列表 - } - else - { - logHelper.Info($"泡前入库任务：{taskInfo.TaskCode}；下发失败，请排除PLC连接"); - } - #endregion - } - else - { - logHelper.Info("未获取到需要下发的泡后入库任务"); - } - } - catch (Exception ex) - { - logHelper.Info("下发任务异常"); - } - - } - - #endregion - - #region 获取待执行的入库任务 - /// - /// 获取待执行的入库任务 - /// - /// - /// - private RealTaskInfo GetAwaitSendTask(string storeCode) - { - RealTaskInfo taskInfo = null; - - try - { - taskInfo = _realTaskInfoService.Query(x => x.StoreCode == storeCode && x.TaskType == 1 && x.TaskStatus == 1).OrderBy(x => x.CreateTime).FirstOrDefault(); - - } - catch (Exception ex) - { - logHelper.Info("获取待执行的入库任务异常", ex); - } - return taskInfo; - } - #endregion - - #region 入库 - - #region 入库,扫码器委托触发 - /// - /// 入库,扫码器委托触发 - /// - /// 仓库编号 - /// 物料条码 - public async Task InStore(string materialBarCode) - { - try - { - if (string.IsNullOrEmpty(materialBarCode)) - { - LogDelegateEvent?.Invoke("未扫到二维码信息！"); - Console.WriteLine($"【{DateTime.Now}】未扫到二维码信息,请重新扫码！"); - return; - } - Console.WriteLine($"【{DateTime.Now}】扫码成功，物料条码：{materialBarCode}"); - logHelper.Info($"扫码成功，物料条码：{materialBarCode}"); - LogDelegateEvent?.Invoke($"扫码成功，物料条码：{materialBarCode}"); - var taskList = await _realTaskInfoService.QueryAsync(d => d.MaterialCode.Equals(materialBarCode) && d.StoreCode == storeCode); - if (taskList.Count() > 0) - { - LogDelegateEvent?.Invoke($"物料条码[{materialBarCode}],任务创建失败,该物料入库任务已存在！"); - Console.WriteLine($"【{DateTime.Now}】物料条码[{materialBarCode}],任务创建失败,该物料入库任务已存在！"); - return; - } - //获取要进入的货道 - string materialType = SubString(materialBarCode);//截取中间物料条码 - BaseSpaceInfo spaceInfo = await GetSpaceInfoByMaterialType(storeCode, materialType); - if (spaceInfo != null) - { - logHelper.Info($"匹配货道：{spaceInfo.ToJson()}"); - LogDelegateEvent?.Invoke($"匹配货道：{spaceInfo.ToJson()}"); - //Console.WriteLine($"【{DateTime.Now}】匹配货道：{spaceInfo.ToJson()}"); - string message = $"箱体码[{materialBarCode}], 入{spaceInfo.SpaceName},入库中...."; - Console.WriteLine($"【{DateTime.Now}】{message}"); - PrintBarCode print = await _printBarCodeServices.FirstAsync(x => x.MaterialBarcode == materialBarCode); - Console.WriteLine($"【{DateTime.Now}】{message}"); - RefreshScanMateriaCodeEvent?.Invoke(materialBarCode, materialType, print.MaterialName, spaceInfo.SpaceName, message); //刷新界面扫码信息 - var result = await CreateInStoreTask(spaceInfo, materialBarCode); //创建入库任务 - if (result) - { - #region 更新过点数据 - //MaterialCompletion completion = new MaterialCompletion(); - //completion.OrderCode = print.OrderCode; - //completion.MaterialBarcode = materialBarCode; - //completion.MaterialCode = print.MaterialCode; - //completion.MaterialName = print.MaterialName; - //completion.StationName = "1004"; - //completion.ProductLineCode = "CX_02"; - //completion.isDownLine = 0; - //completion.CompleteDate = DateTime.Now; - - //await _iMaterialCompletionServices.AddAsync(completion); - #endregion - - RefreshDataGridDelegateEvent?.Invoke(); - await _baseSpaceInfoServices.UpdateSpaceInfo(spaceInfo); - } - } - else - { - //报警停线 - LogDelegateEvent?.Invoke($"未匹配到货道,请设置货道型号!"); - } - } - catch (Exception ex) - { - logHelper.Error($"入库业务异常:{ex}"); - } - } - - #endregion - - #region 创建入库任务 - /// - /// 创建入库任务 - /// - /// - private async Task CreateInStoreTask(BaseSpaceInfo spaceInfo, string materialCode) - { - bool result = false; - try - { - //生成入库任务依次下发至PLC - RealTaskInfo realTaskInfo = new RealTaskInfo(); - realTaskInfo.TaskType = 1; - realTaskInfo.TaskCode = System.Guid.NewGuid().ToString("N").Substring(0, 6); - realTaskInfo.SpaceName = spaceInfo.SpaceName; - realTaskInfo.StoreCode = spaceInfo.StoreCode; - realTaskInfo.SpaceCode = spaceInfo.SpaceCode; - realTaskInfo.MaterialType = spaceInfo.MaterialType; - realTaskInfo.MaterialCode = materialCode; - realTaskInfo.PlanAmount = 1; - realTaskInfo.TaskStatus = 1; //任务状态：1 - 待执行；2 - 执行中；3 - 完成 - realTaskInfo.CreateTime = DateTime.Now; - realTaskInfo.BoxType = spaceInfo.BoxType; - int flag = await _realTaskInfoService.AddAsync(realTaskInfo); - if (flag > 0) - { - logHelper.Info("入库任务创建成功"); - LogDelegateEvent?.Invoke($"[{materialCode}]入库任务创建成功"); - RefreshInStoreTaskEvent?.Invoke(realTaskInfo);//刷新datagrid 列表 - result = true; - } - else - { - logHelper.Info("入库任务创建失败"); - LogDelegateEvent?.Invoke($"[{materialCode}]入库任务创建失败"); - result = false; - } - } - catch (Exception ex) - { - logHelper.Info($"入库任务创建异常：{ex.Message}"); - result = false; - } - return result; - } - - #endregion - - #region 筛选货道 - /// - /// 筛选货道 - /// - /// 货道编码 - /// 二维码中间8位 - /// - private async Task GetSpaceInfoByMaterialType(string storeCode, string materialType) + public async Task EnterStore(string barCode) { - BaseSpaceInfo result = null; - try - { - List info = await _baseSpaceInfoServices.InStoreGetSpaceInfoByMaterialType(storeCode, materialType); - Console.WriteLine($"根据仓库{storeCode}；物料：{materialType}；获取到的货道信息：{info.ToJson()}"); - if (info == null || info.Count == 0) return result; - - // 更新货道库存 - foreach (BaseSpaceInfo item in info) - { - var spaceInfo = ReadSpaceInfoByPlc(item);//更新货道信息 - item.SpaceStock = spaceInfo.SpaceStock; - - if (item.typeCodeB == "materialType" && (item.SpaceStock + item.OnRouteAmount) == 0) - { - string str1 = item.typeCodeB; - string str2 = item.typeNameB; - item.typeCodeB = item.MaterialType; - item.typeNameB = item.typeNameA; - item.MaterialType = str1; - item.typeNameA = str2; - } - // 对调C型号和主型号 需要确定未什么要对调类型？ - else if (spaceInfo.typeCodeC == "materialType" && (item.SpaceStock + item.OnRouteAmount) == 0) - { - string str1 = item.typeCodeC; - string str2 = item.typeNameC; - item.typeCodeC = item.MaterialType; - item.typeNameC = item.typeNameA; - item.MaterialType = str1; - item.typeNameA = str2; - } - } - - info = info.Where(x => x.SpaceStatus == 1 && x.SpaceCapacity > (x.SpaceStock + x.OnRouteAmount)).ToList(); - if (info == null || info.Count == 0) return result; + //根据条码获取物料详情 + var material = _printBarCodeServices.FirstAsync(d => d.MaterialBarcode == barCode).Result; + RecordInStore recordInstore = new RecordInStore(); + recordInstore.StoreCode = storeCode; + recordInstore.StoreArea = ""; + recordInstore.SpaceCode = ""; + string materialType = SubString(barCode);//截取中间物料条码 + recordInstore.MaterialType = materialType; + recordInstore.MaterialCode = barCode; + recordInstore.InStoreTime = DateTime.Now; + recordInstore.BarCodeCode = barCode; + recordInstore.MaterialName = material.MaterialName; + recordInstore.InStoreAmount =1; + recordInstore.EntryPattern = 0; + recordInstore.IsFlag = 0; + recordInstore.CreatedTime = DateTime.Now; - result = info.OrderByDescending(x => x.SpaceStock).First(); - return result; - } - catch (Exception ex) + int result = await _recordInstoreServices.AddAsync(recordInstore); + if (result > 0) { - logHelper.Info("货道信息读取异常", ex); + string message = $"物料[{material.MaterialName}],入库成功！"; + RefreshScanMateriaCodeEvent?.Invoke(material.MaterialCode, barCode, material.MaterialName, "", message); //刷新界面扫码信息 + LogDelegateEvent?.Invoke($"物料[{material.MaterialName}], 入库成功！"); + RefreshDataGridDelegateEvent?.Invoke(); } - - return result; - } - - #endregion - - #region 通过PLC获取货道信息 - /// - /// 通过PLC获取货道信息 - /// - /// 货道信息 - /// - public BaseSpaceInfo ReadSpaceInfoByPlc(BaseSpaceInfo spaceInfo) - { - var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc")); - if (obj != null && obj.plc.IsConnected) + else { - //将货道信息更新到配置文件中 - SpaceAddress spaceAddress = spaceConfig.GetSpaceAddress(spaceInfo.StoreCode, spaceInfo.SpaceCode); - spaceInfo.SpaceStock = obj.plc.ReadInt16(spaceAddress.onStore);//获取 + LogDelegateEvent?.Invoke($"物料[{material.MaterialName}], 入库失败，任务回滚！"); + logHelper.Error($"物料[{material.MaterialName}], 入库失败，任务回滚！"); } - return spaceInfo; } - #endregion #endregion @@ -779,299 +352,5 @@ namespace Aucma.Core.BoxFoam.Business } #endregion - #region 泡前入库任务下发处理 - public bool SendFoamTask_InStore(RealTaskInfo taskInfo) - { - bool result = false; - try - { - SpaceAddress spaceAddress = spaceConfig.GetSpaceAddress(storeCode, taskInfo.SpaceCode); - var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc")); - if (obj != null && obj.plc.IsConnected) - { - logHelper.Info($"下发泡前入库任务：{taskInfo.TaskCode}；仓库{taskInfo.StoreCode}；货道：{taskInfo.SpaceCode}"); - LogDelegateEvent?.Invoke($"下发泡前入库任务：{taskInfo.TaskCode}；仓库{taskInfo.StoreCode}；货道：{taskInfo.SpaceCode},等待plc反馈"); - - //写入应答字 - obj.plc.WriteInt16("DB200.2", "1"); - //写入货道物料类型 - obj.plc.WriteString(spaceAddress.materialType, taskInfo.BoxType); - //写入货道号，plc收到货道号开始入库，并非应答字，所以货道号最后下发 - obj.plc.WriteInt16("DB200.0", taskInfo.SpaceCode.Substring(7, 1)); - //写入完成后读取反馈号进行复位 - ReadShellAnswer_InStore(taskInfo); - result = true; - } - else - { - logHelper.Info($"仓库{taskInfo.StoreCode}；PLC未连接"); - } - } - catch (Exception ex) - { - logHelper.Error("泡后入库任务下发异常", ex); - } - return result; - } - - /// - /// 读取泡前入库应答 - /// - private void ReadShellAnswer_InStore(RealTaskInfo taskInfo) - { - lock (string.Empty) - { - bool isFlag = true; - var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("泡前库Plc")); - try - { - - if (obj != null && obj.plc.IsConnected) - { - do - { - //读取PLC反馈号，上位机清空写入的入库内容 - if (obj.plc.ReadInt16("DB200.86") == 2) - { - obj.plc.WriteInt16("DB200.86", "0"); - //-------------plc清 - //写入货道号 - obj.plc.WriteInt16("DB200.0", "0"); - // 写入应答字 - obj.plc.WriteInt16("DB200.2", "0"); - //写入货道物料类型 - // obj.plc.WriteInt16(spaceAddress.materialType, taskInfo.MaterialType); - //---------------------- - - isFlag = false; - InStoreAnswer(taskInfo.TaskCode); - // TaskInfos.Add(taskInfo); - // ReadShellFinish_InStore(taskCode); - } - Thread.Sleep(500); - } while (isFlag); - } - else - { - logHelper.Info("PLC未连接"); - } - - } - catch (Exception ex) - { - logHelper.Error("读取泡后入库应答字异常", ex); - } - } - } - - - /// - /// 泡前库执行反馈 - /// - private void InStoreAnswer(string taskCode) - { - LogDelegateEvent?.Invoke($"泡前库应答成功，自动释放信号量，进行下发新任务"); - logHelper.Info("泡前库应答成功，自动释放信号量，进行下发新任务"); - // InStoreFinish(taskCode); - semaphore.Release(); - } - #endregion - - #region 入库完成 - /// - /// 入库完成 - /// - /// - /// - /// - private async void InStoreFinish(string spaceCode) - { - try - { - - List tasks = await _realTaskInfoService.QueryAsync(x => x.StoreCode == storeCode && x.SpaceCode == spaceCode && x.TaskStatus == 2); - RealTaskInfo taskInfo = tasks.OrderBy(x => x.CreateTime).FirstOrDefault(); - if (taskInfo != null) - { - BaseSpaceInfo spaceInfo = await _baseSpaceInfoServices.GetSpaceInfoBySpaceCode(taskInfo.StoreCode, taskInfo.SpaceCode); - if (spaceInfo != null) - { - spaceInfo.MaterialType = taskInfo.MaterialType; - - //读取PLC获取货道信息：存放数量、在途数量, - #region Add By wenjy 2023-10-30 13:44:00 通过PLC获取货道信息 - var item = ReadSpaceInfoByPlc(spaceInfo); - spaceInfo.SpaceStock = item.SpaceStock; - if (spaceInfo.OnRouteAmount > 0) - { - // 入库完成，在途减1 - spaceInfo.OnRouteAmount -= 1; - } - - #endregion - - #region 添加货道明细 不控制出库，暂时未添加明细 - BaseSpaceDetail spaceDetail = new BaseSpaceDetail(); - spaceDetail.MaterialType = taskInfo.MaterialType; - spaceDetail.MaterialCode = taskInfo.MaterialCode; - spaceDetail.MaterialName = await GetMaterialName(taskInfo.MaterialType); - spaceDetail.StoreCode = spaceInfo.StoreCode; - spaceDetail.SpaceCode = spaceInfo.SpaceCode; - spaceDetail.MaterialAmount = 1; - //await _baseSpaceDetailServices.InsertSpaceDetail(spaceDetail); - #endregion - - #region 添加入库记录 - RecordInStore recordInstore = new RecordInStore(); - recordInstore.StoreCode = taskInfo.StoreCode; - recordInstore.SpaceCode = taskInfo.SpaceCode; - recordInstore.MaterialCode = taskInfo.MaterialCode; - recordInstore.MaterialType = taskInfo.MaterialType; - recordInstore.MaterialName = await GetMaterialName(taskInfo.MaterialType); - recordInstore.InStoreAmount = 1; - recordInstore.InStoreTime = DateTime.Now; - recordInstore.BarCodeCode = taskInfo.MaterialCode; - #endregion - - await _baseSpaceInfoServices.UpdateSpaceInfo(spaceInfo); - _ = _recordInstoreServices.AddAsync(recordInstore).Result; - bool result = _realTaskInfoService.DeleteAsync(taskInfo).Result; - // bool result = await _recordInstoreServices.SaveRecordToDb(recordInstore, taskInfo, spaceInfo, spaceDetail); - if (result) - { - LogDelegateEvent?.Invoke($"入库完成，更新数据库成功"); - RefreshDataGridDelegateEvent?.Invoke();//刷新datagrid 列表 - } - else - { - LogDelegateEvent?.Invoke($"更新数据库异常"); - } - - } - ////清除任务信息 - //await _realTaskInfoService.DeleteTaskInfo(taskCode, storeCode); - } - - } - catch (Exception ex) - { - logHelper.Info("入库完成逻辑处理异常", ex); - } - } - - #endregion - - #region 获取物料名称 - /// - ///获取物料名称 - /// - /// - /// - public async Task GetMaterialName(string materialType) - { - string materialName = string.Empty; - BaseMaterialInfo info = await _baseMaterialInfoServices.FirstAsync(x => x.MaterialType == materialType); - if (info != null) - { - materialName = info.MaterialName; - } - return materialName; - } - - #endregion - - #region PLC 任务处理表 - /// - /// PLC 任务处理表 - /// - /// 仓库编码 - /// 物料编码 - /// - public async Task MaterialEnterStore(string storeCode, string materialBarCode = "B20231082080029650001") - { - //扫描入库信号,入库完成 - try - { - var taskList = await _realTaskInfoService.QueryAsync(d => d.MaterialType.Equals(materialBarCode) && d.StoreCode == storeCode); - if (taskList.Count() == 0) return; - var obj = taskList.FirstOrDefault(); - var mCode = materialBarCode.Substring(7, 10);//物料条码 - //删除任务表、更新货道、添加入库明细、添加入库记录 - var planInfoList = await _productPlanInfoServices.QueryAsync(d => d.MaterialCode.Equals(mCode));//计划 - if (planInfoList.Count() == 0) - { - logHelper.Error($"物料计划信息为空！"); - return; - } - var baseStoreInfolist = await _baseStoreInfoServices.QueryAsync(d => d.StoreCode.Equals(obj.StoreCode));//仓库 - if (baseStoreInfolist.Count() == 0) - { - logHelper.Error($"仓库信息为空！"); - return; - } - var baseSpacelist = await _baseSpaceInfoServices.QueryAsync(d => d.SpaceCode.Equals(obj.SpaceCode)); - if (taskList.Count() == 0) - { - LogDelegateEvent?.Invoke($"物料[{materialBarCode}],入库记录条码重复异常！"); - logHelper.Error($"货道信息为空！"); - return; - } - var baseSpaceDetailList = await _baseSpaceDetailServices.QueryAsync(d => d.MaterialCode.Equals(obj.MaterialCode));//货到详情 - if (baseSpaceDetailList.Count() != 0) - { - logHelper.Error($"货到信息存在重复物料！"); - return; - } - var baseSpace = baseSpacelist.FirstOrDefault(); - var planInfo = planInfoList.FirstOrDefault(); - var baseStoreInfo = baseStoreInfolist.FirstOrDefault(); - - baseSpace.SpaceStock = baseSpace.SpaceStock + 1; - baseSpace.OnRouteAmount = 0; - //入库记录表 - RecordInStore recordInstore = new RecordInStore(); - recordInstore.StoreCode = storeCode; - recordInstore.StoreArea = baseStoreInfo.StoreArea; - recordInstore.SpaceCode = baseSpace.SpaceCode; - recordInstore.MaterialType = baseSpace.MaterialType; - recordInstore.MaterialCode = mCode; - recordInstore.InStoreTime = DateTime.Now; - recordInstore.BarCodeCode = materialBarCode; - recordInstore.MaterialName = planInfo.MaterialName; - recordInstore.EntryPattern = 0; - recordInstore.IsFlag = 0; - recordInstore.CreatedTime = DateTime.Now; - //入库详情表 - BaseSpaceDetail baseDetail = new BaseSpaceDetail(); - baseDetail.StoreCode = storeCode; - baseDetail.SpaceCode = baseSpace.SpaceCode; - baseDetail.MaterialCode = materialBarCode; - baseDetail.MaterialName = planInfo.MaterialName; - baseDetail.MaterialAmount = 1; - baseDetail.CreatedTime = DateTime.Now; - - bool result = await _recordInstoreServices.SaveRecordToDb(recordInstore, obj, baseSpace, baseDetail); - if (result) - { - string message = $"物料[{planInfo.MaterialName}], 入{baseSpace.SpaceName},入库成功！"; - RefreshScanMateriaCodeEvent?.Invoke(obj.MaterialCode, materialBarCode, planInfo.MaterialName, baseSpace.SpaceName, message); //刷新界面扫码信息 - LogDelegateEvent?.Invoke($"物料[{planInfo.MaterialName}], 入库[{baseSpace.SpaceName}]成功！"); - RefreshDataGridDelegateEvent?.Invoke(); - } - else - { - LogDelegateEvent?.Invoke($"物料[{planInfo.MaterialName}], 入库[{baseSpace.SpaceName}]失败，任务回滚！"); - logHelper.Error($"物料[{planInfo.MaterialName}], 入库[{baseSpace.SpaceName}]失败，任务回滚！"); - } - } - catch (Exception ex) - { - logHelper.Error($"入库数据处理异常:{ex.Message}"); - } - } - - #endregion - #endregion - } } diff --git a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs index ab8f8c32..da5e8f94 100644 --- a/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs +++ b/Aucma.Core.BoxFoam/ViewModels/BeforeFoamingPageModelView.cs @@ -2,6 +2,7 @@ using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Service; +using Aucma.Core.BoxFoam.Business; using Aucma.Core.BoxFoam.Models; using Aucma.Core.BoxFoam.Views.UserPage; using CommunityToolkit.Mvvm.ComponentModel; @@ -39,6 +40,7 @@ namespace Aucma.Core.BoxFoam.ViewModels _baseSpaceInfoServices = App.ServiceProvider.GetService(); SetBoxTypeViewModel.RefreshPageEvent += LoadSpaceStoreMedthAsync; SelectTypeViewModel.RefreshPageEvent += LoadSpaceStoreMedthAsync; + InStoreBusiness.RefreshPageDelegateEvent += LoadSpaceStoreMedthAsync; this.LoadSpaceStoreMedthAsync(); } #region 参数定义 @@ -96,48 +98,51 @@ namespace Aucma.Core.BoxFoam.ViewModels private void LoadSpaceStoreMedthAsync() { string storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");//泡前库code - - var baseSpaceInfolist = _baseSpaceInfoServices.QueryAsync(d => d.StoreCode==storeCode).Result;//仓库 - - if (baseSpaceInfolist == null) return; - if (baseSpaceInfolist.Count > 0) - { - baseSpaceInfolist = baseSpaceInfolist.OrderBy(x => x.ObjId).ToList(); - } - Shapes.Clear(); - foreach (var item in baseSpaceInfolist) + System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => { - SpaceInfoModel model=new SpaceInfoModel(); - model.spaceCode = item.SpaceCode; - model.spaceStock = item.SpaceStock; - model.onTheWay = item.OnRouteAmount; - model.totalAmount = item.SpaceStock + item.OnRouteAmount; - model.materialType = item.MaterialType; - model.typeCodeB = item.typeCodeB; - model.typeCodeC = item.typeCodeC; - model.typeNameA = GetSubstringBetweenCommas(item.typeNameA); - model.typeNameB = GetSubstringBetweenCommas(item.typeNameB); - model.typeNameC = GetSubstringBetweenCommas(item.typeNameC); - model.unusualFlag = item.UnusualFlag == 2 ? "Red" : "White"; - // 夹具型号 - model.boxType = item.BoxType; - if (item.SpaceStatus == 2) + var baseSpaceInfolist = _baseSpaceInfoServices.QueryAsync(d => d.StoreCode == storeCode).Result;//仓库 + + if (baseSpaceInfolist == null) return; + if (baseSpaceInfolist.Count > 0) { - model.setEnable = "False"; - model.inStoreFlag = "Red"; - model.isFlag = "Red"; + baseSpaceInfolist = baseSpaceInfolist.OrderBy(x => x.ObjId).ToList(); } - else + Shapes.Clear(); + foreach (var item in baseSpaceInfolist) { - model.isFlag = item.IsFlag.ToString(); //禁用状态 - model.inStoreFlag ="White"; - } - - model.onlyOne = 1; - model.spaceType = item.SpaceType; + SpaceInfoModel model = new SpaceInfoModel(); + model.spaceCode = item.SpaceCode; + model.spaceStock = item.SpaceStock; + model.onTheWay = item.OnRouteAmount; + model.totalAmount = item.SpaceStock + item.OnRouteAmount; + model.materialType = item.MaterialType; + model.typeCodeB = item.typeCodeB; + model.typeCodeC = item.typeCodeC; + model.typeNameA = GetSubstringBetweenCommas(item.typeNameA); + model.typeNameB = GetSubstringBetweenCommas(item.typeNameB); + model.typeNameC = GetSubstringBetweenCommas(item.typeNameC); + model.unusualFlag = item.UnusualFlag == 2 ? "Red" : "White"; + // 夹具型号 + model.boxType = item.BoxType; + if (item.SpaceStatus == 2) + { + model.setEnable = "False"; + model.inStoreFlag = "Red"; + model.isFlag = "Red"; + } + else + { + model.isFlag = item.IsFlag.ToString(); //禁用状态 + model.inStoreFlag = "White"; + } - Shapes.Add(model); - } + model.onlyOne = 1; + model.spaceType = item.SpaceType; + + Shapes.Add(model); + } + })); + } #endregion diff --git a/Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs index c533352f..ce26068a 100644 --- a/Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs @@ -30,18 +30,10 @@ namespace Aucma.Core.BoxFoam.ViewModels private InStoreBusiness inStoreBusiness = InStoreBusiness.Instance; public IndexPageViewModel() { - - // inStoreBusiness.init();//初始化界面？ - - _recordInstoreServices = App.ServiceProvider.GetService(); _realTaskInfoService =App.ServiceProvider.GetService(); - //Job_BoxFoamInStoreTask_Quartz.RefreshDataGridDelegateEvent += LoadData;//刷新底部列表 InStoreBusiness.RefreshDataGridDelegateEvent += LoadData;//刷新底部列表 - // Job_TestTask_Quartz.DataGridDelegateEvent += ExecMethod;//刷新日志 - // Job_BoxFoamInStoreTask_Quartz.RefreshScanMateriaCodeEvent += RefreshScanInfo;//扫码信息刷新 InStoreBusiness.RefreshScanMateriaCodeEvent += RefreshScanInfo;//扫码信息刷新 - // Job_BoxFoamInStoreTask_Quartz.LogDelegateEvent += PrintMessageToListBox;//入库日志事件 InStoreBusiness.LogDelegateEvent += PrintMessageToListBox;//入库日志事件 LoadData(); } @@ -57,7 +49,7 @@ namespace Aucma.Core.BoxFoam.ViewModels var storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode"); DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")); DateTime endTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")); - List list = _realTaskInfoService.QueryAsync(x=>x.StoreCode.Equals(storeCode)).Result.OrderBy(x=>x.CreateTime).Take(4).ToList(); + List list = _recordInstoreServices.QueryAsync(x=>x.StoreCode.Equals(storeCode)).Result.OrderBy(x=>x.CreatedTime).Take(10).ToList(); System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () => { PlanInfoDataGrid.Clear(); @@ -66,15 +58,7 @@ namespace Aucma.Core.BoxFoam.ViewModels { foreach (var item in list) { - PlanInfoDataGrid.Add(new RealTaskInfo() - { - TaskCode = item.TaskCode, - MaterialCode = item.MaterialCode, - MaterialType = item.MaterialType, - SpaceName = item.SpaceName, - CreateTime = item.CreateTime, - TaskStatus = item.TaskStatus - }); + PlanInfoDataGrid.Add(item); i++; }; } @@ -90,8 +74,8 @@ namespace Aucma.Core.BoxFoam.ViewModels #endregion #region 初始化datagrid - private ObservableCollection planInfoDataGrid = new ObservableCollection(); - public ObservableCollection PlanInfoDataGrid + private ObservableCollection planInfoDataGrid = new ObservableCollection(); + public ObservableCollection PlanInfoDataGrid { get { return planInfoDataGrid; } set diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs index b3fb297f..91725cac 100644 --- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs @@ -21,8 +21,8 @@ namespace Aucma.Core.BoxFoam.ViewModels { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel)); private IndexPageView firstPage = new IndexPageView();//首页 - //CollectionFoamLine line = new CollectionFoamLine(); - //CollectionFoamMachine machine = new CollectionFoamMachine(); + CollectionFoamLine line = new CollectionFoamLine(); + CollectionFoamMachine machine = new CollectionFoamMachine(); RealTimeInventoryPageView realTimeInventoryPage = new RealTimeInventoryPageView(); EnterWarehouseStatisticsPageView enterWarehouseStatisticsPage = new EnterWarehouseStatisticsPageView(); FoamPlanPageView foamPlanPageView = new FoamPlanPageView(); diff --git a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml index c013dc7e..1f078e9c 100644 --- a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml @@ -188,18 +188,24 @@ - - - - + + + + + + + + + + - - + + diff --git a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml.cs b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml.cs index 4878ae69..7f0ac36d 100644 --- a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml.cs +++ b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml.cs @@ -27,6 +27,11 @@ namespace Aucma.Core.BoxFoam.Views InitializeComponent(); this.DataContext = new IndexPageViewModel(); } - + //在载入行的时候在行表头添加编号 + + private void dgvMH_LoadingRow(object sender, DataGridRowEventArgs e) + { + e.Row.Header = (e.Row.GetIndex() + 1).ToString(); + } } } diff --git a/Aucma.Core.TemperatureTask/AucamTemperatureMeasurementService.cs b/Aucma.Core.TemperatureTask/AucamTemperatureMeasurementService.cs index e3833caa..be919e5e 100644 --- a/Aucma.Core.TemperatureTask/AucamTemperatureMeasurementService.cs +++ b/Aucma.Core.TemperatureTask/AucamTemperatureMeasurementService.cs @@ -152,7 +152,8 @@ namespace Aucma.Core.TemperatureTask completion.MaterialBarcode = temperatureHistory.CpNo; completion.MaterialCode = barcode.MaterialCode; completion.MaterialName = barcode.MaterialName; - completion.StationName = "测温检验01"; + string stationName = Appsettings.app("Common", "StationName"); + completion.StationName = stationName; completion.ProductLineCode = "CX_02"; completion.CompleteDate = DateTime.Now; completionList.Add(completion);