diff --git a/.vs/HighWayIot/FileContentIndex/1c63f6e6-f1ad-4c78-9240-2254ad3d7cad.vsidx b/.vs/HighWayIot/FileContentIndex/1c63f6e6-f1ad-4c78-9240-2254ad3d7cad.vsidx new file mode 100644 index 00000000..bf8aa8b7 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/1c63f6e6-f1ad-4c78-9240-2254ad3d7cad.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/608dc4fe-8782-4199-a10a-87cffbc4bb5a.vsidx b/.vs/HighWayIot/FileContentIndex/608dc4fe-8782-4199-a10a-87cffbc4bb5a.vsidx new file mode 100644 index 00000000..ce6f6511 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/608dc4fe-8782-4199-a10a-87cffbc4bb5a.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/707be534-7360-453b-97c3-4e6a2a68c462.vsidx b/.vs/HighWayIot/FileContentIndex/707be534-7360-453b-97c3-4e6a2a68c462.vsidx new file mode 100644 index 00000000..99ca9b54 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/707be534-7360-453b-97c3-4e6a2a68c462.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/bc0bfad9-8db9-4e24-bbe3-e1f4ea485582.vsidx b/.vs/HighWayIot/FileContentIndex/bc0bfad9-8db9-4e24-bbe3-e1f4ea485582.vsidx new file mode 100644 index 00000000..4be41662 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/bc0bfad9-8db9-4e24-bbe3-e1f4ea485582.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 39bc08b1..8ef679ca 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/AssemblyPlanBusiness.cs b/Aucma.Scada.Business/AssemblyPlanBusiness.cs index c9af9dcf..89b01872 100644 --- a/Aucma.Scada.Business/AssemblyPlanBusiness.cs +++ b/Aucma.Scada.Business/AssemblyPlanBusiness.cs @@ -104,7 +104,7 @@ namespace Aucma.Scada.Business // planInfos[i].executeOrder = i + 1; //} //_executePlanInfoService.UpdateRangeExecutePlanInfo(planInfos); - + planInfos = planInfos.Where(x => x.executeStatus != 3).ToList(); RefreshExecutePlanInfoEvent?.Invoke(planInfos); } } diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index 95ada858..7405d696 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -48,6 +48,11 @@ namespace Aucma.Scada.Business /// 实时任务 /// private IRealTaskInfoService _taskInfoService; + + + private IBaseSpaceDetailService _baseSpaceDetailService; + + private IBaseBomInfoService _baseBomInfoService; #endregion #region 委托事件 @@ -80,10 +85,21 @@ namespace Aucma.Scada.Business { _spaceInfoService = registerServices.GetService(); _taskInfoService = registerServices.GetService(); + _baseSpaceDetailService = registerServices.GetService(); + _baseBomInfoService = registerServices.GetService(); taskHandle.InStoreFinsihEvent += FoamTaskFeedback; grabImage.RefreshMaterialCodeStrEvent += InStore; grabImage.RefreshLogMessageEvent += PrintLogInfoMessage; StartPassDown(); + + //Task.Run(() => + //{ + // Thread.Sleep(6000); + // for (int i = 1; i < 9; i++) + // { + // InStore("F23406001225101900" + i); + // } + //}); } /// @@ -95,13 +111,17 @@ namespace Aucma.Scada.Business try { PrintLogInfoMessage($"扫码成功，物料码：{materialCode}"); - string materialType = materialCode; + string materialType = SubStringMaterialCode(materialCode); var spaceInfo = _spaceInfoService.InStoreGetSpaceInfoByMaterialType(appConfig.foamStoreCode, materialType); if (spaceInfo != null) { PrintLogInfoMessage($"匹配货道：{spaceInfo.spaceName}"); - RefreshScanMateriaCodeEvent?.Invoke(materialCode, materialType, spaceInfo.spaceName, appConfig.foamStoreCode); //刷新界面扫码信息 - CreateInStoreTask(spaceInfo, materialCode); //创建入库任务 + RefreshScanMateriaCodeEvent?.Invoke(materialCode, GetMaterialName(materialType), spaceInfo.spaceName, appConfig.foamStoreCode); //刷新界面扫码信息 + var result = CreateInStoreTask(spaceInfo, materialCode); //创建入库任务 + if (result) + { + _spaceInfoService.UpdateSpaceInfo(spaceInfo); + } } else { @@ -119,30 +139,37 @@ namespace Aucma.Scada.Business /// 创建入库任务 /// /// - private void CreateInStoreTask(BaseSpaceInfo spaceInfo, string materialCode) + private bool CreateInStoreTask(BaseSpaceInfo spaceInfo, string materialCode) { - //生成入库任务依次下发至PLC + bool result = false; + + #region 任务赋值 RealTaskInfo realTaskInfo = new RealTaskInfo(); realTaskInfo.taskType = 1; realTaskInfo.taskCode = System.Guid.NewGuid().ToString("N").Substring(0, 6); realTaskInfo.storeCode = spaceInfo.storeCode; realTaskInfo.spaceCode = spaceInfo.spaceCode; realTaskInfo.materialType = spaceInfo.materialType; - realTaskInfo.materialCode = System.Guid.NewGuid().ToString("N").Substring(0, 6); ; + realTaskInfo.materialCode = materialCode; realTaskInfo.planAmount = 1; realTaskInfo.taskStatus = 1; realTaskInfo.createTime = DateTime.Now; - bool result = _taskInfoService.AddTaskInfo(realTaskInfo); + #endregion + + result = _taskInfoService.AddTaskInfo(realTaskInfo); if (result) { PrintLogInfoMessage("入库任务创建成功"); RefreshInStoreTaskEvent?.Invoke(realTaskInfo); + + result = true; } else { PrintLogInfoMessage("入库任务创建失败"); } + return result; } #region 轮询获取入库任务下发至PLC，等待PLC执行反馈，完成后再次下发 @@ -157,7 +184,7 @@ namespace Aucma.Scada.Business { while (true) { - PassDownShellTask(); + PassDownFoamTask(); Thread.Sleep(1000); } }); @@ -169,7 +196,7 @@ namespace Aucma.Scada.Business /// /// /// - private void PassDownShellTask() + private void PassDownFoamTask() { RealTaskInfo taskInfo = GetAwaitSendTask(appConfig.foamStoreCode); if (taskInfo != null) @@ -177,13 +204,15 @@ namespace Aucma.Scada.Business PrintLogInfoMessage($"下发泡后入库任务：{taskInfo.taskCode}；仓库{taskInfo.storeCode}；货道：{taskInfo.spaceCode}"); //taskHandle.SendShellTask_InStore(taskInfo); Thread.Sleep(200); - if (taskHandle.SendShellTask_InStore(taskInfo)) + if (taskHandle.SendFoamTask_InStore(taskInfo)) { PrintLogInfoMessage($"泡后入库任务：{taskInfo.taskCode}；下发成功，等待PLC执行反馈"); taskInfo.taskStatus = 2; _taskInfoService.UpdateTaskInfo(taskInfo); + RefreshInStoreTaskEvent?.Invoke(taskInfo); + //if (semaphore.Wait(TimeSpan.FromSeconds(20))) //{ // // 收到反馈 @@ -197,6 +226,8 @@ namespace Aucma.Scada.Business semaphore.Wait(); //一直堵塞直到信号量释放 PrintLogInfoMessage($"泡后入库任务：{taskInfo.taskCode}；执行完成"); + + RefreshInStoreTaskEvent?.Invoke(taskInfo); } else { @@ -224,12 +255,6 @@ namespace Aucma.Scada.Business { taskInfo = _taskInfoService.GetTaskInfoByStoreCode(storeCode, 1); - //if (taskInfo != null) - //{ - // taskInfo.taskStatus = 2; - // _taskInfoService.UpdateTaskInfo(taskInfo); - //} - } catch (Exception ex) { @@ -245,13 +270,12 @@ namespace Aucma.Scada.Business private void FoamTaskFeedback(string taskCode) { - Thread.Sleep(4000); - PrintLogInfoMessage("泡后执行完成，自动释放信号量"); + InStoreFinish(taskCode); + semaphore.Release(); - InStoreFinish(taskCode); } #endregion @@ -275,8 +299,20 @@ namespace Aucma.Scada.Business { //读取PLC获取货道信息：存放数量、在途数量 spaceInfo.materialType = taskInfo.materialType; + spaceInfo.spaceStock = spaceInfo.spaceStock + 1; _spaceInfoService.UpdateSpaceInfo(spaceInfo); + #region 添加货道明细 + BaseSpaceDetail spaceDetail = new BaseSpaceDetail(); + spaceDetail.materialType = taskInfo.materialType; + spaceDetail.materialCode = taskInfo.materialCode; + spaceDetail.materialName = GetMaterialName(taskInfo.materialType); + spaceDetail.storeCode = spaceInfo.storeCode; + spaceDetail.spaceCode = spaceInfo.spaceCode; + spaceDetail.materialAmount = 1; + _baseSpaceDetailService.InsertSpaceDetail(spaceDetail); + #endregion + } //清除任务信息 _taskInfoService.DeleteTaskInfo(taskCode, appConfig.foamStoreCode); @@ -330,5 +366,22 @@ namespace Aucma.Scada.Business { return _taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.foamStoreCode }, 1); } + + /// + /// 通过BOM获取物料名称 + /// + /// + /// + public string GetMaterialName(string materialType) + { + string materialName = string.Empty; + var info = _baseBomInfoService.GetBomInfoByMaterialCode(materialType); + if (info != null) + { + materialName = info.materialName; + } + + return materialName; + } } } diff --git a/Aucma.Scada.Business/InStoreTaskHandle.cs b/Aucma.Scada.Business/InStoreTaskHandle.cs index 4296a486..1c8a6d1b 100644 --- a/Aucma.Scada.Business/InStoreTaskHandle.cs +++ b/Aucma.Scada.Business/InStoreTaskHandle.cs @@ -60,7 +60,7 @@ namespace Aucma.Scada.Business } #region 泡后入库任务下发处理 - public bool SendShellTask_InStore(RealTaskInfo taskInfo) + public bool SendFoamTask_InStore(RealTaskInfo taskInfo) { bool result = false; try @@ -72,11 +72,11 @@ namespace Aucma.Scada.Business if (_plc.IsConnected) { //写入货道号 - _plc.writeStringByAddress(plcConfig.in_shell_spaceCode, taskInfo.spaceCode); + _plc.writeStringByAddress(plcConfig.in_foam_spaceCode, taskInfo.spaceCode); //写入应答字 - _plc.writeInt32ByAddress(plcConfig.in_shell_answer, 1); + _plc.writeInt32ByAddress(plcConfig.in_foam_answer, 1); //写入任务号 - _plc.writeStringByAddress(plcConfig.in_shell_task, taskInfo.taskCode); + _plc.writeStringByAddress(plcConfig.in_foam_task, taskInfo.taskCode); //写入完成后读取应答字进行复位 ReadShellAnswer_InStore(taskInfo.taskCode); @@ -121,14 +121,14 @@ namespace Aucma.Scada.Business do { //读取PLC应答字为2时，上位机清空写入的入库内容 - if (_plc.readInt32ByAddress(plcConfig.in_shell_answer) == 2) + if (_plc.readInt32ByAddress(plcConfig.in_foam_answer) == 2) { //写入货道号 - _plc.writeStringByAddress(plcConfig.in_shell_spaceCode, string.Empty); + _plc.writeStringByAddress(plcConfig.in_foam_spaceCode, string.Empty); //写入应答字 - _plc.writeInt32ByAddress(plcConfig.in_shell_answer, 0); + _plc.writeInt32ByAddress(plcConfig.in_foam_answer, 0); //写入任务号 - _plc.writeStringByAddress(plcConfig.in_shell_task, string.Empty); + _plc.writeStringByAddress(plcConfig.in_foam_task, string.Empty); isFlag = false; ReadShellFinish_InStore(taskCode); @@ -176,11 +176,11 @@ namespace Aucma.Scada.Business do { //读取PLC入库任务完成 - if (_plc.readInt32ByAddress(plcConfig.in_shell_finish) == 1) + if (_plc.readInt32ByAddress(plcConfig.in_foam_finish) == 1) { - _plc.writeInt32ByAddress(plcConfig.in_shell_finish, 0); + _plc.writeInt32ByAddress(plcConfig.in_foam_finish, 0); - //string taskCode = _plc.readStringByAddress(plcConfig.out_shell_task, 10); + //string taskCode = _plc.readStringByAddress(plcConfig.out_foam_task, 10); InStoreFinsihEvent?.Invoke(taskCode); diff --git a/Aucma.Scada.Business/MainBusiness.cs b/Aucma.Scada.Business/MainBusiness.cs index a4202fdb..5a188f85 100644 --- a/Aucma.Scada.Business/MainBusiness.cs +++ b/Aucma.Scada.Business/MainBusiness.cs @@ -40,8 +40,7 @@ namespace Aucma.Scada.Business public void InitPlc() { //初始化Plc - plcPool.InitPlc("MelsecBinaryPlc", plcConfig.shell_Plc_Ip, plcConfig.shell_Plc_Port, appConfig.shellStoreCode); - plcPool.InitPlc("MelsecBinaryPlc", plcConfig.liner_Plc_Ip, plcConfig.liner_Plc_Port, appConfig.linerStoreCode); + plcPool.InitPlc("MelsecBinaryPlc", plcConfig.foam_Plc_Ip, plcConfig.foam_Plc_Port, appConfig.foamStoreCode); } /// diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 489fbafe..1235bf9d 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -58,6 +58,10 @@ namespace Aucma.Scada.Business /// 货道明细 /// private IBaseSpaceDetailService _spaceDetailService; + + private IExecutePlanInfoService _executePlanInfoService; + + private IProductPlanInfoService _productPlanInfoService; #endregion #region 委托事件 @@ -84,6 +88,9 @@ namespace Aucma.Scada.Business /// public delegate void RefreshLogMessage(string message); public event RefreshLogMessage RefreshLogMessageEvent; + + public delegate void RefreshAssemblyPlanInit(); + public event RefreshAssemblyPlanInit RefreshAssemblyPlanInitEvent; #endregion private OutStoreBusiness() @@ -92,7 +99,8 @@ namespace Aucma.Scada.Business _taskInfoService = registerServices.GetService(); _bomInfoService = registerServices.GetService(); _spaceDetailService = registerServices.GetService(); - + _executePlanInfoService = registerServices.GetService(); + _productPlanInfoService = registerServices.GetService(); assemblyPlanBusiness.NextPassExecutePlanInfoEvent += PlanHandle; taskHandleBusiness.OutStoreFinsihEvent += TaskFeedback; StartPassDown(); @@ -111,7 +119,7 @@ namespace Aucma.Scada.Business if (planInfo != null) { string taskCode = DateTime.Now.ToString("HH:mm:ss"); - var bomInfo = _bomInfoService.GetChildenBomInfoByMaterialCode(planInfo.materialCode, appConfig.shellMaterialType); + var bomInfo = _bomInfoService.GetChildenBomInfoByMaterialCode(planInfo.materialCode, appConfig.foamMaterialType); for (int i = 0; i < planInfo.planAmount - planInfo.completeAmount; i++) { OutStore(appConfig.foamStoreCode, bomInfo, planInfo.executePlanCode, taskCode); @@ -196,6 +204,10 @@ namespace Aucma.Scada.Business PrintLogInfoMessage("出库任务创建失败"); } } + else + { + PrintLogInfoMessage("出库任务创建失败，货道明细为空"); + } } catch (Exception ex) { @@ -281,9 +293,8 @@ namespace Aucma.Scada.Business /// private void PassDownTaskInfo() { - string shellCode = string.Empty; - string linerCode = string.Empty; string taskCode = string.Empty; + string executePlanCode = string.Empty; int iFlag = 0; completedTasks = 0; @@ -297,7 +308,8 @@ namespace Aucma.Scada.Business foreach (var item in taskInfoList) { taskCode = item.taskCode; - if (taskHandleBusiness.SendShellTask_OutStore(item)) + executePlanCode = item.planCode; + if (taskHandleBusiness.SendFoamTask_OutStore(item)) { PrintLogInfoMessage($"下发泡后出库任务：{item.taskCode}；仓库{item.storeCode}；货道：{item.spaceCode}；等待PLC执行反馈"); item.taskStatus = 2; @@ -308,30 +320,20 @@ namespace Aucma.Scada.Business PrintLogInfoMessage($"泡后出库任务：{item.taskCode}；下发失败，请排除PLC连接"); continue; } - shellCode = item.materialCode; - + _taskInfoService.UpdateTaskInfo(item); RefreshScanMateriaCodeEvent?.Invoke(item.materialCode, item.materialType, item.spaceName, item.storeCode); } + if (iFlag == taskInfoList.Count) { - _taskInfoService.UpdateRangeTaskInfo(taskInfoList); - - //if (semaphore.Wait(TimeSpan.FromSeconds(20))) - //{ - // // 收到反馈 - // PrintLogInfoMessage("收到反馈，继续执行"); - //} - //else - //{ - // PrintLogInfoMessage("超时未反馈"); - //} semaphore.Wait(); //一直堵塞直到信号量释放 - PrintLogInfoMessage($"出库任务：{taskCode}；执行完成，绑定泡后条码：{shellCode}；内胆条码：{linerCode}"); + PrintLogInfoMessage($"出库任务：{taskCode}；执行完成"); + UpdatePlanInfo(executePlanCode); } } else @@ -366,12 +368,6 @@ namespace Aucma.Scada.Business RealTaskInfo linerInfo = _taskInfoService.GetTaskInfoByStoreCode(appConfig.linerStoreCode, 2); if (linerInfo != null) taskInfos.Add(linerInfo); } - - //if(taskInfos.Count > 0) - //{ - // taskInfos.ForEach(x => x.taskStatus = 2); - // _taskInfoService.UpdateRangeTaskInfo(taskInfos); - //} } catch (Exception ex) { @@ -432,21 +428,27 @@ namespace Aucma.Scada.Business var taskInfo = _taskInfoService.GetTaskInfoByTaskCode(taskCode, storeCode); if (taskInfo != null) { - //刷新界面 - RefreshScanMateriaCodeEvent?.Invoke(string.Empty, string.Empty, string.Empty, taskInfo.storeCode); - var spaceInfo = _spaceInfoService.GetSpaceInfoBySpaceCode(taskInfo.storeCode, taskInfo.spaceCode); if (spaceInfo != null) { //读取PLC获取货道信息：存放数量、在途数量 //spaceInfo.materialType = taskInfo.materialType; + if (spaceInfo.spaceStock == 0) + { + spaceInfo.materialType = string.Empty; + } _spaceInfoService.UpdateSpaceInfo(spaceInfo); //读取PLC获取物料类型进行绑定 } //清除任务信息 _taskInfoService.DeleteTaskInfo(taskCode, storeCode); + + _spaceDetailService.DeleteSpaceDetailByMaterialCode(taskInfo.materialCode); + + //刷新界面 + RefreshScanMateriaCodeEvent?.Invoke(string.Empty, string.Empty, string.Empty, taskInfo.storeCode); } } @@ -456,13 +458,55 @@ namespace Aucma.Scada.Business } } + /// + /// 更新计划信息 + /// + /// + private void UpdatePlanInfo(string planCode) + { + try + { + var executeInfo = _executePlanInfoService.GetExecutePlanInfoByPlanCode(planCode); + if (executeInfo != null) + { + executeInfo.completeAmount += 1; + + if (executeInfo.completeAmount == executeInfo.planAmount) + { + executeInfo.executeStatus = 3; + } + + _executePlanInfoService.UpdateExecutePlanInfo(executeInfo); + + var productInfo = _productPlanInfoService.GetProductPlanByPlanCode(executeInfo.productPlanCode); + if (productInfo != null) + { + productInfo.completeAmount += 1; + if (productInfo.completeAmount == productInfo.planAmount) + { + productInfo.endTime = DateTime.Now; + } + + _productPlanInfoService.UpdateProductPlanInfo(productInfo); + } + } + + RefreshAssemblyPlanInitEvent?.Invoke(); + + } + catch (Exception ex) + { + PrintLogErrorMessage("计划信息更新异常", ex); + } + } + /// /// 获取出库任务 /// /// public List GetOutStoreTask() { - var taskInfos = _taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.foamStoreCode, appConfig.linerStoreCode }, appConfig.outstoreTaskType); + var taskInfos = _taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.foamStoreCode}, appConfig.outstoreTaskType); return taskInfos; } diff --git a/Aucma.Scada.Business/OutStoreTaskHandle.cs b/Aucma.Scada.Business/OutStoreTaskHandle.cs index 3597b8f4..7f09a7f7 100644 --- a/Aucma.Scada.Business/OutStoreTaskHandle.cs +++ b/Aucma.Scada.Business/OutStoreTaskHandle.cs @@ -43,7 +43,7 @@ namespace Aucma.Scada.Business private Dictionary _plcDictionary = new Dictionary(); /// - /// 箱壳任务编号,PLC反馈后进行赋值 + /// 泡后任务编号,PLC反馈后进行赋值 /// private string shellTaskCode = string.Empty; @@ -69,12 +69,12 @@ namespace Aucma.Scada.Business _plcDictionary = _pool.GetAll(); } - #region 箱壳出库任务下发处理 + #region 泡后出库任务下发处理 /// - /// 箱壳出库任务下发 + /// 泡后出库任务下发 /// /// - public bool SendShellTask_OutStore(RealTaskInfo taskInfo) + public bool SendFoamTask_OutStore(RealTaskInfo taskInfo) { bool result = false; try @@ -86,13 +86,13 @@ namespace Aucma.Scada.Business if (_plc.IsConnected) { //写入货道号 - _plc.writeStringByAddress(plcConfig.out_shell_spaceCode, taskInfo.spaceCode); + _plc.writeStringByAddress(plcConfig.out_foam_spaceCode, taskInfo.spaceCode); //写入出库数量 - _plc.writeInt32ByAddress(plcConfig.out_shell_amount, taskInfo.planAmount); + _plc.writeInt32ByAddress(plcConfig.out_foam_amount, taskInfo.planAmount); //写入应答字 - _plc.writeInt32ByAddress(plcConfig.out_shell_answer, 1); + _plc.writeInt32ByAddress(plcConfig.out_foam_answer, 1); //写入任务号 - _plc.writeStringByAddress(plcConfig.out_shell_task, taskInfo.taskCode); + _plc.writeStringByAddress(plcConfig.out_foam_task, taskInfo.taskCode); //写入完成后读取应答字进行复位 ReadShellAnswer_OutStore(taskInfo.taskCode); @@ -111,21 +111,21 @@ namespace Aucma.Scada.Business } catch (Exception ex) { - logHelper.Error("箱壳出库任务下发异常", ex); + logHelper.Error("泡后出库任务下发异常", ex); } return result; } /// - /// 读取箱壳出库应答 + /// 读取泡后出库应答 /// private void ReadShellAnswer_OutStore(string taskCode) { lock (string.Empty) { bool isFlag = true; - IPlc _plc = _plcDictionary[appConfig.shellStoreCode]; + IPlc _plc = _plcDictionary[appConfig.foamStoreCode]; try { Task.Run(() => @@ -137,16 +137,16 @@ namespace Aucma.Scada.Business do { //读取PLC应答字为2时，上位机清空写入的出库内容 - if (_plc.readInt32ByAddress(plcConfig.out_shell_answer) == 2) + if (_plc.readInt32ByAddress(plcConfig.out_foam_answer) == 2) { //写入货道号 - _plc.writeStringByAddress(plcConfig.out_shell_spaceCode, string.Empty); + _plc.writeStringByAddress(plcConfig.out_foam_spaceCode, string.Empty); //写入出库数量 - _plc.writeInt32ByAddress(plcConfig.out_shell_amount, 0); + _plc.writeInt32ByAddress(plcConfig.out_foam_amount, 0); //写入应答字 - _plc.writeInt32ByAddress(plcConfig.out_shell_answer, 0); + _plc.writeInt32ByAddress(plcConfig.out_foam_answer, 0); //写入任务号 - _plc.writeStringByAddress(plcConfig.out_shell_task, string.Empty); + _plc.writeStringByAddress(plcConfig.out_foam_task, string.Empty); isFlag = false; ReadShellFinish_OutStore(taskCode); @@ -157,31 +157,31 @@ namespace Aucma.Scada.Business } else { - logHelper.Info($"仓库{appConfig.shellStoreCode}；PLC未连接"); + logHelper.Info($"仓库{appConfig.foamStoreCode}；PLC未连接"); } } else { - logHelper.Info($"PLC信息为空，通过{appConfig.shellStoreCode}未获取到该仓库对应的PLC信息"); + logHelper.Info($"PLC信息为空，通过{appConfig.foamStoreCode}未获取到该仓库对应的PLC信息"); } }); } catch (Exception ex) { - logHelper.Error("读取箱壳出库应答字异常", ex); + logHelper.Error("读取泡后出库应答字异常", ex); } } } /// - /// 读取箱壳出库完成 + /// 读取泡后出库完成 /// private void ReadShellFinish_OutStore(string taskCode) { lock (string.Empty) { bool isFlag = true; - IPlc _plc = _plcDictionary[appConfig.shellStoreCode]; + IPlc _plc = _plcDictionary[appConfig.foamStoreCode]; shellTaskCode = taskCode; try { @@ -194,13 +194,13 @@ namespace Aucma.Scada.Business do { //读取PLC出库任务完成 - if (_plc.readInt32ByAddress(plcConfig.out_shell_finish) == 1) + if (_plc.readInt32ByAddress(plcConfig.out_foam_finish) == 1) { - _plc.writeInt32ByAddress(plcConfig.out_shell_finish, 0); + _plc.writeInt32ByAddress(plcConfig.out_foam_finish, 0); - //string taskCode = _plc.readStringByAddress(plcConfig.out_shell_task, 10); + //string taskCode = _plc.readStringByAddress(plcConfig.out_foam_task, 10); - OutStoreFinsihEvent?.Invoke(appConfig.shellStoreCode, taskCode); + OutStoreFinsihEvent?.Invoke(appConfig.foamStoreCode, taskCode); isFlag = false; } @@ -210,181 +210,22 @@ namespace Aucma.Scada.Business } else { - logHelper.Info($"仓库{appConfig.shellStoreCode}；PLC未连接"); + logHelper.Info($"仓库{appConfig.foamStoreCode}；PLC未连接"); } } else { - logHelper.Info($"PLC信息为空，通过{appConfig.shellStoreCode}未获取到该仓库对应的PLC信息"); + logHelper.Info($"PLC信息为空，通过{appConfig.foamStoreCode}未获取到该仓库对应的PLC信息"); } }); } catch (Exception ex) { - logHelper.Error("读取箱壳出库出库完成异常", ex); + logHelper.Error("读取泡后出库出库完成异常", ex); } } } #endregion - #region 内胆出库任务处理 - /// - /// 内胆出库任务下发 - /// - /// - public bool SendLinerTask_OutStore(RealTaskInfo taskInfo) - { - bool result = false; - try - { - IPlc _plc = _plcDictionary[taskInfo.storeCode]; - - if (_plc != null) - { - if (_plc.IsConnected) - { - //写入货道号 - _plc.writeStringByAddress(plcConfig.out_liner_spaceCode, taskInfo.spaceCode); - //写入出库数量 - _plc.writeInt32ByAddress(plcConfig.out_liner_amount, taskInfo.planAmount); - //写入应答字 - _plc.writeInt32ByAddress(plcConfig.out_liner_answer, 1); - //写入任务号 - _plc.writeStringByAddress(plcConfig.out_liner_task, taskInfo.taskCode); - - //写入完成后读取应答字进行复位 - ReadLinerAnswer_OutStore(taskInfo.taskCode); - - result = true; - } - else - { - logHelper.Info($"仓库{taskInfo.storeCode}；PLC未连接"); - } - } - else - { - logHelper.Info($"PLC信息为空，通过{taskInfo.storeCode}未获取到该仓库对应的PLC信息"); - } - } - catch (Exception ex) - { - logHelper.Error("内胆出库任务下发异常", ex); - } - return result; - } - - /// - /// 读取内胆出库应答 - /// - private void ReadLinerAnswer_OutStore(string taskCode) - { - lock (string.Empty) - { - bool isFlag = true; - IPlc _plc = _plcDictionary[appConfig.shellStoreCode]; - linerTaskCode = taskCode; - try - { - Task.Run(() => - { - - if (_plc != null) - { - if (_plc.IsConnected) - { - do - { - //读取PLC应答字为2时，上位机清空写入的出库内容 - if (_plc.readInt32ByAddress(plcConfig.out_liner_answer) == 2) - { - //写入货道号 - _plc.writeStringByAddress(plcConfig.out_liner_spaceCode, string.Empty); - //写入出库数量 - _plc.writeInt32ByAddress(plcConfig.out_liner_amount, 0); - //写入应答字 - _plc.writeInt32ByAddress(plcConfig.out_liner_answer, 0); - //写入任务号 - _plc.writeStringByAddress(plcConfig.out_liner_task, string.Empty); - isFlag = false; - - Thread.Sleep(5000); - - ReadLinerFinish_OutStore(taskCode); - } - } while (isFlag); - } - else - { - logHelper.Info($"仓库{appConfig.linerStoreCode}；PLC未连接"); - } - } - else - { - logHelper.Info($"PLC信息为空，通过{appConfig.linerStoreCode}未获取到该仓库对应的PLC信息"); - } - }); - } - catch (Exception ex) - { - logHelper.Error("读取内胆出库应答字异常", ex); - } - } - } - - /// - /// 读取内胆出库完成 - /// - private void ReadLinerFinish_OutStore(string taskCode) - { - lock (string.Empty) - { - try - { - Task.Run(() => - { - bool isFlag = true; - IPlc _plc = _plcDictionary[appConfig.linerStoreCode]; - if (_plc != null) - { - if (_plc.IsConnected) - { - do - { - //读取PLC出库任务完成 - if (_plc.readInt32ByAddress(plcConfig.out_liner_finish) == 1) - { - _plc.writeInt32ByAddress(plcConfig.out_liner_finish, 0); - - //string taskCode = _plc.readStringByAddress(plcConfig.out_liner_task, 10); - - OutStoreFinsihEvent?.Invoke(appConfig.linerStoreCode, taskCode); - - isFlag = false; - - Thread.Sleep(5000); - } - } while (isFlag); - } - else - { - logHelper.Info($"仓库{appConfig.linerStoreCode}；PLC未连接"); - } - } - else - { - logHelper.Info($"PLC信息为空，通过{appConfig.linerStoreCode}未获取到该仓库对应的PLC信息"); - } - }); - } - catch (Exception ex) - { - logHelper.Error("读取内胆出库完成异常", ex); - } - } - } - #endregion - - } } diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index 85d5a407..9d5d48b7 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 7d573f50..b535af42 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/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll index 24799176..0be42e37 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb index 6db363c9..37a565da 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll index 304d70f2..8180362d 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb index c1fba409..b3e95b0c 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll index e8e5c5c1..7fe51a59 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb index 35b729e9..5643594b 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.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 aad1787c..64fa95e3 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.csproj.FileListAbsolute.txt b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt index f4c9b649..3ac8440b 100644 --- a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt +++ b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt @@ -44,11 +44,10 @@ E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Sc E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.AssemblyReference.cache -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CoreCompileInputs.cache E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll.config E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.pdb +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.dll @@ -60,10 +59,12 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\D E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\MvCodeReaderSDK.Net.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\SqlSugar.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\log4net.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HslCommunication.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.pdb @@ -77,9 +78,8 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\D E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.xml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.xml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.AssemblyReference.cache +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CoreCompileInputs.cache E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\MvCodeReaderSDK.Net.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.pdb diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index 85d5a407..9d5d48b7 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 7d573f50..b535af42 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/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll index 24799176..0be42e37 100644 Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll differ diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb index 6db363c9..37a565da 100644 Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.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 25eaa064..cb8a93c0 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.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt index da9ae917..0621edf9 100644 --- a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt +++ b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt @@ -1,17 +1,17 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.pdb -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\MvCodeReaderSDK.Net.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.AssemblyReference.cache -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\MvCodeReaderSDK.Net.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\log4net.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.pdb -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.pdb +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.xml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.AssemblyReference.cache +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache index dbcd9fbc..26314f78 100644 Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.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 85d5a407..9d5d48b7 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 7d573f50..b535af42 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 fa84ce10..59bed907 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 8b4761e7..ed7a37f6 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/HighWayIot.Config.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll index 24799176..0be42e37 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb index 6db363c9..37a565da 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll index 304d70f2..8180362d 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb index c1fba409..b3e95b0c 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll index e8e5c5c1..7fe51a59 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb index 35b729e9..5643594b 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/config/App.Ini b/Aucma.Scada.UI/bin/Debug/config/App.Ini index 2a0dc89d..becd51dd 100644 --- a/Aucma.Scada.UI/bin/Debug/config/App.Ini +++ b/Aucma.Scada.UI/bin/Debug/config/App.Ini @@ -10,7 +10,7 @@ linerStoreCode=NDJCK-001 foamStoreCode=FPJCK-001 -shellMaterialType=3 +foamMaterialType=2 linerMaterialType=4 diff --git a/Aucma.Scada.UI/bin/Debug/config/Plc.Ini b/Aucma.Scada.UI/bin/Debug/config/Plc.Ini index e5efac98..f0ea3610 100644 --- a/Aucma.Scada.UI/bin/Debug/config/Plc.Ini +++ b/Aucma.Scada.UI/bin/Debug/config/Plc.Ini @@ -3,6 +3,8 @@ PLC˿=6000 ڵPLCIP=127.0.0.1 ڵPLC˿=6000 +ݺPLCIP=127.0.0.1 +ݺPLC˿=6000 #ַ [shell_inStore_address] =D101 @@ -29,3 +31,13 @@ Ӧ=M203 =M204 =M205 +[foam_inStore_address] +=D101 +Ӧ=D103 +=D104 +=D105 +[foam_outStore_address] +=M101 +Ӧ=M103 +=M104 +=M105 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 01317f01..1a7c3640 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.csproj.FileListAbsolute.txt b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt index 1e6e2937..af050ba0 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt @@ -241,30 +241,12 @@ E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.SuggestedBindingRedirects.cache -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Oracle.ManagedDataAccess.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe.config E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\CommonServiceLocator.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.dll @@ -278,12 +260,13 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\L E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\MySql.Data.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Oracle.ManagedDataAccess.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\SqlSugar.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Data.SQLite.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Windows.Interactivity.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\MvCodeReaderSDK.Net.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\log4net.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Memory.dll @@ -294,6 +277,7 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\S E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Buffers.dll E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll.config +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.pdb @@ -312,14 +296,37 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\L E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.pdb E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.xml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.SuggestedBindingRedirects.cache +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.baml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.baml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.baml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.baml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.baml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.baml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.baml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.baml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.baml E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.baml @@ -336,10 +343,3 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\A E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.xml -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\MvCodeReaderSDK.Net.dll -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.pdb -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.g.cs -E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.baml diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index fa84ce10..59bed907 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 8b4761e7..ed7a37f6 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/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref index 3c16438b..f65f4fa2 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref @@ -1,4 +1,18 @@ - - +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref index f3caf620..46f22ffa 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref @@ -1,4 +1,4 @@ - +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; diff --git a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs index ffa4e1ed..c65238fb 100644 --- a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs @@ -1,62 +1,2 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace XamlGeneratedNamespace { - - - /// - /// GeneratedInternalTypeHelper - /// - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { - - /// - /// CreateInstance - /// - protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { - return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) - | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); - } - - /// - /// GetPropertyValue - /// - protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { - return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); - } - - /// - /// SetPropertyValue - /// - protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { - propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); - } - - /// - /// CreateDelegate - /// - protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { - return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod - | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { - delegateType, - handler}, null))); - } - - /// - /// AddEventHandler - /// - protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { - eventInfo.AddEventHandler(target, handler); - } - } -} + diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs index b50d9907..8ef4829b 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs @@ -21,6 +21,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan private AppConfig appConfig = AppConfig.Instance; + private OutStoreBusiness outStoreBusiness = OutStoreBusiness.Instance; public AssemblyPlanViewModel() { MoveUpCommand = new RelayCommand(obj => MoveUp(obj)); @@ -31,6 +32,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan PlanInfoEditCommand = new RelayCommand(PlanInfoEdit); assemblyPlanBusiness.RefreshExecutePlanInfoEvent += RefreshDataGrid; + outStoreBusiness.RefreshAssemblyPlanInitEvent += RefreshPlanInfoDataGrid; Init(); } @@ -254,6 +256,28 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan } + + private void RefreshPlanInfoDataGrid() + { + App.Current.Dispatcher.Invoke((Action)(() => + { + var planInfos = assemblyPlanBusiness.GetEexecutePlanInfosByProductLineCode(); + RefreshDataGrid(planInfos); + + //加载正在执行的计划 + planInfos = planInfos.Where(x => x.executeStatus == 2).ToList(); + if (planInfos.Count > 0) + { + ExecutePlanInfo planInfo = planInfos.OrderBy(x => x.executeOrder).First(); + RefreshPlanExecute(planInfo); + } + + OrderCode = string.Empty; + PlanCode = string.Empty; + ProductModel = string.Empty; + })); + } + /// /// 柱状体加载 /// diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs index 911c3705..52819827 100644 --- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs @@ -200,24 +200,36 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo /// public void Query() { - var info = inStoreBusiness.GetInStoreTask(); - if (info != null) + lock (string.Empty) { - info.ForEach(x => RefreshInStoreTask(x)); - } - if (materialTypeCombox == "箱壳") - { - materialTypeCombox = "X-001"; - } - else if (materialTypeCombox == "内胆") - { - materialTypeCombox = "X-002"; - } - else - { - materialTypeCombox = string.Empty; + #region 通过数据库获取数据进行刷新 + var info = inStoreBusiness.GetInStoreTask(); + if (info != null) + { + taskItems = new ObservableCollection(); + //info.ForEach(x => RefreshInStoreTask(x)); + try + { + foreach (var item in info) + { + + App.Current.Dispatcher.Invoke((Action)(() => + { + item.materialType = inStoreBusiness.GetMaterialName(item.materialType); + taskItems.Add(item); + InstoreTask = taskItems; + })); + } + } + catch (Exception ex) + { + logHelper.Error("入库任务列表刷新异常", ex); + } + } + #endregion + + InstoreTask = taskItems.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1); } - InstoreTask = taskItems.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1 && !string.IsNullOrEmpty(materialTypeCombox) ? x.storeCode == materialTypeCombox : 1 == 1); } /// @@ -279,18 +291,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo /// private void RefreshInStoreTask(RealTaskInfo taskInfo) { - try - { - App.Current.Dispatcher.Invoke((Action)(() => - { - taskItems.Add(taskInfo); - InstoreTask = taskItems; - })); - } - catch (Exception ex) - { - logHelper.Error("入库任务列表刷新异常", ex); - } + Query(); } /// diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index fc9ebfef..5f100236 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/AppConfig.cs b/HighWayIot.Config/AppConfig.cs index 8cbd2ef1..f2c3f5ce 100644 --- a/HighWayIot.Config/AppConfig.cs +++ b/HighWayIot.Config/AppConfig.cs @@ -80,12 +80,12 @@ namespace HighWayIot.Config } /// - /// 箱壳物料类型编号 + /// 泡后物料类型编号 /// - public string shellMaterialType + public string foamMaterialType { - get { return iniHelper.IniReadValue("system", "shellMaterialType"); } - set { iniHelper.IniWriteValue("system", "shellMaterialType", value); } + get { return iniHelper.IniReadValue("system", "foamMaterialType"); } + set { iniHelper.IniWriteValue("system", "foamMaterialType", value); } } /// diff --git a/HighWayIot.Config/PlcConfig.cs b/HighWayIot.Config/PlcConfig.cs index c3aee633..fe2335ce 100644 --- a/HighWayIot.Config/PlcConfig.cs +++ b/HighWayIot.Config/PlcConfig.cs @@ -26,210 +26,109 @@ namespace HighWayIot.Config } #region PLC基础参数 + /// - /// 箱壳PLCIP + /// 泡后PLC IP /// - public string shell_Plc_Ip + public string foam_Plc_Ip { - get { return iniHelper.IniReadValue("plcSystem", "箱壳PLCIP"); } - set { iniHelper.IniWriteValue("plcSystem", "箱壳PLCIP", value); } + get { return iniHelper.IniReadValue("plcSystem", "泡后PLCIP"); } + set { iniHelper.IniWriteValue("plcSystem", "泡后PLCIP", value); } } /// - /// 箱壳PLC端口 + /// 泡后PLC端口 /// - public int shell_Plc_Port + public int foam_Plc_Port { - get { return stringChange.ParseToInt(iniHelper.IniReadValue("plcSystem", "箱壳PLC端口")); } - set { iniHelper.IniWriteValue("plcSystem", "箱壳PLC端口", value.ToString()); } - } - - /// - /// 内胆PLCIP - /// - public string liner_Plc_Ip - { - get { return iniHelper.IniReadValue("plcSystem", "内胆PLCIP"); } - set { iniHelper.IniWriteValue("plcSystem", "内胆PLCIP", value); } - } - - /// - /// 内胆PLC端口 - /// - public int liner_Plc_Port - { - get { return stringChange.ParseToInt(iniHelper.IniReadValue("plcSystem", "内胆PLC端口")); } - set { iniHelper.IniWriteValue("plcSystem", "内胆PLC端口", value.ToString()); } + get { return stringChange.ParseToInt(iniHelper.IniReadValue("plcSystem", "泡后PLC端口")); } + set { iniHelper.IniWriteValue("plcSystem", "泡后PLC端口", value.ToString()); } } #endregion - #region 箱壳入库地址 - /// - /// 箱壳——入库货道号 - /// - public string in_shell_spaceCode - { - get { return iniHelper.IniReadValue("shell_inStore_address", "入库货道号"); } - set { iniHelper.IniWriteValue("shell_inStore_address", "入库货道号", value); } - } - - /// - /// 箱壳——入库应答字 - /// - public string in_shell_answer - { - get { return iniHelper.IniReadValue("shell_inStore_address", "入库应答字"); } - set { iniHelper.IniWriteValue("shell_inStore_address", "入库应答字", value); } - } - - /// - /// 箱壳——入库任务号 - /// - public string in_shell_task - { - get { return iniHelper.IniReadValue("shell_inStore_address", "入库任务号"); } - set { iniHelper.IniWriteValue("shell_inStore_address", "入库任务号", value); } - } - - /// - /// 箱壳——入库完成 - /// - public string in_shell_finish - { - get { return iniHelper.IniReadValue("shell_inStore_address", "入库完成"); } - set { iniHelper.IniWriteValue("shell_inStore_address", "入库完成", value); } - } - #endregion - - #region 内胆入库地址 - /// - /// 内胆——入库货道号 - /// - public string in_liner_spaceCode - { - get { return iniHelper.IniReadValue("liner_inStore_address", "入库货道号"); } - set { iniHelper.IniWriteValue("liner_inStore_address", "入库货道号", value); } - } - - /// - /// 内胆——入库应答字 - /// - public string in_liner_answer - { - get { return iniHelper.IniReadValue("liner_inStore_address", "入库应答字"); } - set { iniHelper.IniWriteValue("liner_inStore_address", "入库应答字", value); } - } - - /// - /// 内胆——入库任务号 - /// - public string in_liner_task - { - get { return iniHelper.IniReadValue("liner_inStore_address", "入库任务号"); } - set { iniHelper.IniWriteValue("liner_inStore_address", "入库任务号", value); } - } - - /// - /// 内胆——入库完成 - /// - public string in_liner_finish - { - get { return iniHelper.IniReadValue("liner_inStore_address", "入库完成"); } - set { iniHelper.IniWriteValue("liner_inStore_address", "入库完成", value); } - } - #endregion - - #region 箱壳出库地址 - /// - /// 箱壳——出库货道号 - /// - public string out_shell_spaceCode - { - get { return iniHelper.IniReadValue("shell_outStore_address", "出库货道号"); } - set { iniHelper.IniWriteValue("shell_outStore_address", "出库货道号", value); } - } - + #region 泡后入库地址 /// - /// 箱壳——出库数量 + /// 泡后——入库货道号 /// - public string out_shell_amount + public string in_foam_spaceCode { - get { return iniHelper.IniReadValue("shell_outStore_address", "出库数量"); } - set { iniHelper.IniWriteValue("shell_outStore_address", "出库数量", value); } + get { return iniHelper.IniReadValue("foam_inStore_address", "入库货道号"); } + set { iniHelper.IniWriteValue("foam_inStore_address", "入库货道号", value); } } /// - /// 箱壳——出库应答字 + /// 泡后——入库应答字 /// - public string out_shell_answer + public string in_foam_answer { - get { return iniHelper.IniReadValue("shell_outStore_address", "出库应答字"); } - set { iniHelper.IniWriteValue("shell_outStore_address", "出库应答字", value); } + get { return iniHelper.IniReadValue("foam_inStore_address", "入库应答字"); } + set { iniHelper.IniWriteValue("foam_inStore_address", "入库应答字", value); } } /// - /// 箱壳——出库任务号 + /// 泡后——入库任务号 /// - public string out_shell_task + public string in_foam_task { - get { return iniHelper.IniReadValue("shell_outStore_address", "出库任务号"); } - set { iniHelper.IniWriteValue("shell_outStore_address", "出库任务号", value); } + get { return iniHelper.IniReadValue("foam_inStore_address", "入库任务号"); } + set { iniHelper.IniWriteValue("foam_inStore_address", "入库任务号", value); } } /// - /// 箱壳——出库完成 + /// 泡后——入库完成 /// - public string out_shell_finish + public string in_foam_finish { - get { return iniHelper.IniReadValue("shell_outStore_address", "出库完成"); } - set { iniHelper.IniWriteValue("shell_outStore_address", "出库完成", value); } + get { return iniHelper.IniReadValue("foam_inStore_address", "入库完成"); } + set { iniHelper.IniWriteValue("foam_inStore_address", "入库完成", value); } } #endregion - #region 内胆出库地址 + + #region 泡后出库地址 /// - /// 内胆——出库货道号 + /// 泡后——出库货道号 /// - public string out_liner_spaceCode + public string out_foam_spaceCode { - get { return iniHelper.IniReadValue("liner_outStore_address", "出库货道号"); } - set { iniHelper.IniWriteValue("liner_outStore_address", "出库货道号", value); } + get { return iniHelper.IniReadValue("foam_outStore_address", "出库货道号"); } + set { iniHelper.IniWriteValue("foam_outStore_address", "出库货道号", value); } } /// - /// 内胆——出库数量 + /// 泡后——出库数量 /// - public string out_liner_amount + public string out_foam_amount { - get { return iniHelper.IniReadValue("liner_outStore_address", "出库数量"); } - set { iniHelper.IniWriteValue("liner_outStore_address", "出库数量", value); } + get { return iniHelper.IniReadValue("foam_outStore_address", "出库数量"); } + set { iniHelper.IniWriteValue("foam_outStore_address", "出库数量", value); } } /// - /// 内胆——出库应答字 + /// 泡后——出库应答字 /// - public string out_liner_answer + public string out_foam_answer { - get { return iniHelper.IniReadValue("liner_outStore_address", "出库应答字"); } - set { iniHelper.IniWriteValue("liner_outStore_address", "出库应答字", value); } + get { return iniHelper.IniReadValue("foam_outStore_address", "出库应答字"); } + set { iniHelper.IniWriteValue("foam_outStore_address", "出库应答字", value); } } /// - /// 内胆——出库任务号 + /// 泡后——出库任务号 /// - public string out_liner_task + public string out_foam_task { - get { return iniHelper.IniReadValue("liner_outStore_address", "出库任务号"); } - set { iniHelper.IniWriteValue("liner_outStore_address", "出库任务号", value); } + get { return iniHelper.IniReadValue("foam_outStore_address", "出库任务号"); } + set { iniHelper.IniWriteValue("foam_outStore_address", "出库任务号", value); } } /// - /// 内胆——出库完成 + /// 泡后——出库完成 /// - public string out_liner_finish + public string out_foam_finish { - get { return iniHelper.IniReadValue("liner_outStore_address", "出库完成"); } - set { iniHelper.IniWriteValue("liner_outStore_address", "出库完成", value); } + get { return iniHelper.IniReadValue("foam_outStore_address", "出库完成"); } + set { iniHelper.IniWriteValue("foam_outStore_address", "出库完成", value); } } #endregion } diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll index 24799176..0be42e37 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb index 6db363c9..37a565da 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index c2bac32d..3648908a 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.Config/obj/Debug/HighWayIot.Config.dll b/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll index 24799176..0be42e37 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb b/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb index 6db363c9..37a565da 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache index f23d94a8..fef83bd1 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/Impl/MelsecBinaryPlc.cs b/HighWayIot.Plc/Impl/MelsecBinaryPlc.cs index 0929cba1..88e1dc5f 100644 --- a/HighWayIot.Plc/Impl/MelsecBinaryPlc.cs +++ b/HighWayIot.Plc/Impl/MelsecBinaryPlc.cs @@ -282,13 +282,11 @@ namespace HighWayIot.Plc.Impl return true; } log.PlcLog(String.Format("通过PLC地址{0}写入int32类型数据{1}失败！！！", address, value)); - this.IsConnected = false; return false; } catch (Exception ex) { log.Error(String.Format("通过PLC地址{0}写入int32类型数据异常", address), ex); - this.IsConnected = false; return false; } } diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll index 304d70f2..8180362d 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb index c1fba409..b3e95b0c 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 9e62d761..3a863487 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.Plc/obj/Debug/HighWayIot.Plc.dll b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll index 304d70f2..8180362d 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb index c1fba409..b3e95b0c 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll index 24799176..0be42e37 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb index 6db363c9..37a565da 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index e8e5c5c1..7fe51a59 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index 35b729e9..5643594b 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 3314f309..2402165c 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.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index e8e5c5c1..7fe51a59 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index 35b729e9..5643594b 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/service/IBaseBomInfoService.cs b/HighWayIot.Repository/service/IBaseBomInfoService.cs index 71eaf860..f7662de0 100644 --- a/HighWayIot.Repository/service/IBaseBomInfoService.cs +++ b/HighWayIot.Repository/service/IBaseBomInfoService.cs @@ -14,5 +14,12 @@ namespace HighWayIot.Repository.service /// /// BaseBomInfo GetChildenBomInfoByMaterialCode(string materialCode, string materialType); + + /// + /// 根据物料编号获取BOM信息 + /// + /// + /// + BaseBomInfo GetBomInfoByMaterialCode(string materialCode); } } diff --git a/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs index dc7c4b7c..60f4e7dd 100644 --- a/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs @@ -44,6 +44,25 @@ namespace HighWayIot.Repository.service.Impl return bomInfo; } + /// + /// 根据物料编号获取BOM信息 + /// + /// + /// + public BaseBomInfo GetBomInfoByMaterialCode(string materialCode) + { + BaseBomInfo bomInfo = null; + try + { + bomInfo = _bomInfoRepository.GetFirst(x => x.materialCode == materialCode); + } + catch (Exception ex) + { + logHelper.Error("根据物料编号获取BOM信息异常", ex); + } + return bomInfo; + } + private List GetChildenByParentId(string parentId, List result = null) { if (result == null) diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs index 03ae7bf9..bb13a1f7 100644 --- a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs @@ -35,11 +35,11 @@ namespace HighWayIot.Repository.service.Impl if (spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配 { - spaceInfos = GetEmptySpaceInfo(); + spaceInfos = GetEmptySpaceInfo(store); } logHelper.Info($"根据仓库{store}；物料：{materialType}；获取到的货道信息：{jsonChange.ModeToJson(spaceInfos)}"); spaceInfo = inStoreFilter(spaceInfos); - if(spaceInfo != null) + if (spaceInfo != null) { logHelper.Info($"仓库{store}；物料：{materialType}；匹配的入库货道信息：{jsonChange.ModeToJson(spaceInfo)}"); @@ -81,13 +81,13 @@ namespace HighWayIot.Repository.service.Impl /// 获取空货道：未分配物料型号的空白货道 /// /// - private List GetEmptySpaceInfo() + private List GetEmptySpaceInfo(string store) { List spaceInfos = null; try { Expression> exp = s1 => true; - exp = exp.And(x => x.materialType == null && x.spaceCapacity != x.spaceStock); + exp = exp.And(x => x.materialType == null && x.storeCode == store && x.spaceCapacity != x.spaceStock); spaceInfos = _mesRepository.GetList(exp); } catch (Exception ex) diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index d9a213c3..1cc1b33f 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/bin/Debug/HighWayIot.Config.dll b/HighWayIot/bin/Debug/HighWayIot.Config.dll index 24799176..0be42e37 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Config.dll and b/HighWayIot/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Config.pdb b/HighWayIot/bin/Debug/HighWayIot.Config.pdb index 6db363c9..37a565da 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll index e8e5c5c1..7fe51a59 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb index 35b729e9..5643594b 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index c1370a29..bba53926 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ