diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 31bb43ee..9de77f68 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index 9f4cf46a..faf88e2f 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -85,11 +85,6 @@ namespace Aucma.Scada.Business StartPassDown(); } - private void HandleTimer() - { - InStore("SC232"); - } - /// /// 入库 /// @@ -99,7 +94,7 @@ namespace Aucma.Scada.Business try { PrintLogInfoMessage($"扫码成功，物料码：{materialCode}"); - string materialType = SubStringMaterialCode(materialCode); + string materialType = materialCode; var spaceInfo = _spaceInfoService.InStoreGetSpaceInfoByMaterialType(appConfig.foamStoreCode, materialType); if (spaceInfo != null) { diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 92694690..489fbafe 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -99,7 +99,7 @@ namespace Aucma.Scada.Business } /// - /// 接收下达的组装计划，根据BOM获取需要出库的箱壳、内胆物料信息 + /// 接收下达的组装计划，根据BOM获取需要出库的泡后、内胆物料信息 /// /// private void PlanHandle(ExecutePlanInfo planInfo) @@ -111,15 +111,11 @@ namespace Aucma.Scada.Business if (planInfo != null) { string taskCode = DateTime.Now.ToString("HH:mm:ss"); - var shellBomInfo = _bomInfoService.GetChildenBomInfoByMaterialCode(planInfo.materialCode, appConfig.shellMaterialType); - var linerBomInfo = _bomInfoService.GetChildenBomInfoByMaterialCode(planInfo.materialCode, appConfig.linerMaterialType); + var bomInfo = _bomInfoService.GetChildenBomInfoByMaterialCode(planInfo.materialCode, appConfig.shellMaterialType); for (int i = 0; i < planInfo.planAmount - planInfo.completeAmount; i++) { - OutStore(appConfig.shellStoreCode, shellBomInfo, planInfo.executePlanCode, taskCode); + OutStore(appConfig.foamStoreCode, bomInfo, planInfo.executePlanCode, taskCode); Thread.Sleep(500); - OutStore(appConfig.linerStoreCode, linerBomInfo, planInfo.executePlanCode, taskCode); - Thread.Sleep(500); - } } }); @@ -296,41 +292,23 @@ namespace Aucma.Scada.Business if (taskInfoList.Count > 0) { - taskAmount = taskInfoList.Count; //下发的任务数量，默认2（箱壳、内胆），箱壳、内胆均执行完成后才会释放信号量 + taskAmount = taskInfoList.Count; //下发的任务数量，默认2（泡后、内胆），泡后、内胆均执行完成后才会释放信号量 foreach (var item in taskInfoList) { taskCode = item.taskCode; - if (item.storeCode == appConfig.shellStoreCode) + if (taskHandleBusiness.SendShellTask_OutStore(item)) { - if (taskHandleBusiness.SendShellTask_OutStore(item)) - { - PrintLogInfoMessage($"下发箱壳出库任务：{item.taskCode}；仓库{item.storeCode}；货道：{item.spaceCode}；等待PLC执行反馈"); - item.taskStatus = 2; - iFlag++; - } - else - { - PrintLogInfoMessage($"箱壳出库任务：{item.taskCode}；下发失败，请排除PLC连接"); - continue; - } - shellCode = item.materialCode; + PrintLogInfoMessage($"下发泡后出库任务：{item.taskCode}；仓库{item.storeCode}；货道：{item.spaceCode}；等待PLC执行反馈"); + item.taskStatus = 2; + iFlag++; } - else if (item.storeCode == appConfig.linerStoreCode) + else { - if (taskHandleBusiness.SendLinerTask_OutStore(item)) - { - PrintLogInfoMessage($"下发内胆出库任务：{item.taskCode}；仓库{item.storeCode}；货道：{item.spaceCode}；等待PLC执行反馈"); - item.taskStatus = 2; - iFlag++; - } - else - { - PrintLogInfoMessage($"内胆出库任务：{item.taskCode}；下发失败，请排除PLC连接"); - continue; - } - linerCode = item.materialCode; + PrintLogInfoMessage($"泡后出库任务：{item.taskCode}；下发失败，请排除PLC连接"); + continue; } + shellCode = item.materialCode; RefreshScanMateriaCodeEvent?.Invoke(item.materialCode, item.materialType, item.spaceName, item.storeCode); } @@ -352,7 +330,7 @@ namespace Aucma.Scada.Business semaphore.Wait(); //一直堵塞直到信号量释放 - PrintLogInfoMessage($"出库任务：{taskCode}；执行完成，绑定箱壳条码：{shellCode}；内胆条码：{linerCode}"); + PrintLogInfoMessage($"出库任务：{taskCode}；执行完成，绑定泡后条码：{shellCode}；内胆条码：{linerCode}"); } } @@ -374,13 +352,13 @@ namespace Aucma.Scada.Business List taskInfos = new List(); try { - RealTaskInfo shellTaskInfo = _taskInfoService.GetTaskInfoByStoreCode(appConfig.shellStoreCode, 2); + RealTaskInfo foamTaskInfo = _taskInfoService.GetTaskInfoByStoreCode(appConfig.foamStoreCode, 2); - if (shellTaskInfo != null) + if (foamTaskInfo != null) { - taskInfos.Add(shellTaskInfo); - //获取与箱壳任务匹配的内胆任务 - RealTaskInfo linerTaskInfo = _taskInfoService.GetTaskInfoByTaskCode(shellTaskInfo.taskCode, appConfig.linerStoreCode); + taskInfos.Add(foamTaskInfo); + //获取与泡后任务匹配的内胆任务 + RealTaskInfo linerTaskInfo = _taskInfoService.GetTaskInfoByTaskCode(foamTaskInfo.taskCode, appConfig.linerStoreCode); if (linerTaskInfo != null) taskInfos.Add(linerTaskInfo); } else @@ -409,42 +387,21 @@ namespace Aucma.Scada.Business /// private void TaskFeedback(string storeCode, string taskCode) { - if (storeCode == appConfig.shellStoreCode) - { - ShellTaskFeedback(taskCode); - } - else - { - LinerTaskFeedback(taskCode); - } - } - - /// - /// 箱壳执行反馈 - /// - private void ShellTaskFeedback(string taskCode) - { - Interlocked.Increment(ref completedTasks); - - CheckCompletedTasks(); - - PrintLogInfoMessage("箱壳执行完成，自动释放信号量"); - - OutStoreFinish(taskCode, appConfig.shellStoreCode); + FoamTaskFeedback(taskCode); } /// - /// 内胆执行反馈 + /// 泡后执行反馈 /// - private void LinerTaskFeedback(string taskCode) + private void FoamTaskFeedback(string taskCode) { Interlocked.Increment(ref completedTasks); CheckCompletedTasks(); - PrintLogInfoMessage("内胆执行完成，自动释放信号量"); + PrintLogInfoMessage("泡后执行完成，自动释放信号量"); - OutStoreFinish(taskCode, appConfig.linerStoreCode); + OutStoreFinish(taskCode, appConfig.foamStoreCode); } /// @@ -505,7 +462,7 @@ namespace Aucma.Scada.Business /// public List GetOutStoreTask() { - var taskInfos = _taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.shellStoreCode, appConfig.linerStoreCode }, appConfig.outstoreTaskType); + var taskInfos = _taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.foamStoreCode, appConfig.linerStoreCode }, appConfig.outstoreTaskType); return taskInfos; } diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index 1bd90d61..0e59dabf 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index b7455700..6875aac6 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index f5e30690..aad1787c 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index 1bd90d61..0e59dabf 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index b7455700..6875aac6 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache index eb2a8e84..25eaa064 100644 Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index 1bd90d61..0e59dabf 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb index b7455700..6875aac6 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 9cb41505..2991f951 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb index 5421258f..3123cc99 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/config/App.Ini b/Aucma.Scada.UI/bin/Debug/config/App.Ini index 9fac4e67..2a0dc89d 100644 --- a/Aucma.Scada.UI/bin/Debug/config/App.Ini +++ b/Aucma.Scada.UI/bin/Debug/config/App.Ini @@ -8,6 +8,8 @@ shellStoreCode=XKJCK-001 linerStoreCode=NDJCK-001 +foamStoreCode=FPJCK-001 + shellMaterialType=3 linerMaterialType=4 diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 28a97a28..45f81c55 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index 9cb41505..2991f951 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb index 5421258f..3123cc99 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs index 2506a7c4..5e2167ca 100644 --- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs @@ -298,6 +298,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo MaterialCode = materialCode; MaterialName = materialName; SpaceName = spaceName; + ScanTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); } } } diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 2009baab..fc9ebfef 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index 49d744eb..c2bac32d 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 5680fa11..9e62d761 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 7b9149ff..3314f309 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index 098d3543..d9a213c3 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 19709d0f..c1370a29 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ