合并

TeamAAS-VM/Core/Management.cs

@@ -2031,6 +2031,7 @@ namespace TeamAAS_VP.Core
                             }
                             if (lockResult.Pressure >= stationConfig.DataInfo.CTQ_LSL_Pressure && lockResult.Pressure <= stationConfig.DataInfo.CTQ_USL_Pressure)
                             {
+                                SendTaskMessage($"Screw{lockResult.Number}:压力不合格", MessageLevel.Error);
                                 pressureRes = true;
                             }
                             if (lockResult.LockTurns >= lockResult.TargetTurnsLowerLimit && lockResult.LockTurns <= lockResult.TargetTurnsUpperLimit)
@@ -2710,7 +2711,14 @@ namespace TeamAAS_VP.Core
 
                                                     //产品发生改变并且供料器发生了变化时，需要通知PLC进行取料更改
                                                     await plc.WriteNodeAsync(addressConfig.Out_ScrewFeederIsChanged.Address, (Int16)1); //不发生改变
-                                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                                    if (models)
+                                                    {
+                                                        await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
+                                                    }
+                                                    else
+                                                    {
+                                                        await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                                    }
                                                 }
                                             }
                                             else
@@ -2720,7 +2728,14 @@ namespace TeamAAS_VP.Core
 
                                                 //产品发生改变并且供料器发生了变化时，需要通知PLC进行取料更改
                                                 await plc.WriteNodeAsync(addressConfig.Out_ScrewFeederIsChanged.Address, (Int16)1); //不发生改变
-                                                await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                                if (models)
+                                                {
+                                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
+                                                }
+                                                else
+                                                {
+                                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                                }
                                             }
                                         }
                                         LogHelper.WriteLogMes($"【mes结束QUERY】");
@@ -2747,6 +2762,7 @@ namespace TeamAAS_VP.Core
                                                 // string productccode = ProductMainSN[i];
                                                 //获取当前工位的配置
                                     var stationConfig = _configService.GetDeviceInfo(i);
+                                    var sysConfig = _configService.GetSystemConfiguration();
                                     SendTaskMessage($"收到{i}:{stationConfig.DeviceName}上传本站数据请求...", MessageLevel.Debug);
                                     //从服务器中获取当前时间
                                     LogHelper.WriteLogMes($"【从服务器中获取当前时间】");
@@ -2851,7 +2867,7 @@ namespace TeamAAS_VP.Core
                                                 MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
                                                 PROCESS_OUTCOME = turnRes ? "PASS" : "FAIL",
                                                 PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
-                                                CTQ_UNIT_OF_MEASURE = "圈",
+                                                CTQ_UNIT_OF_MEASURE = "Turn",
                                                 ERROR_MESSAGE = turnRes ? "NA" : "Turn_Spec OOS",
                                                 PD_ATTR_01 = ProductMainSN[i],
                                                 PD_ATTR_02 = midValue,
@@ -2879,7 +2895,7 @@ namespace TeamAAS_VP.Core
                                                 MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
                                                 PROCESS_OUTCOME = pressureRes ? "PASS" : "FAIL",
                                                 PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
-                                                CTQ_UNIT_OF_MEASURE = "N",
+                                                CTQ_UNIT_OF_MEASURE = "kg",
                                                 ERROR_MESSAGE = pressureRes ? "NA" : "Pressure_Spec OOS",
                                                 PD_ATTR_01 = ProductMainSN[i],
                                                 PD_ATTR_02 = midValue,
@@ -2953,6 +2969,11 @@ namespace TeamAAS_VP.Core
                                     //上传mes
                                     if (stationConfig.EnableMES)
                                     {
+                                        //测试使用,强制上传mes为pass
+                                        if (sysConfig.IsMesResult)
+                                        {
+                                            resultToMes.Clear();
+                                        }
                                         (bool isSuccess, string response) = await _mesService.SubmitGetExAsync(ProductMainSN[i], "", dataToMes, resultToMes, _LastMesCheckTime[i], serverTimeResult.Now);
                                         if (isSuccess)
                                         {

TeamAAS-VM/Data/SystemDatabaseService.cs

@@ -563,6 +563,10 @@ namespace TeamAAS_VP.Data
 
         }
 
+
+
+
+
         /// <summary>
         /// 获取指定产品名称的一个星期内按照每天统计对应的类别和数量
         /// </summary>

TeamAAS-VM/Models/SystemConfiguration.cs

@@ -257,6 +257,14 @@ namespace TeamAAS_VP.Models
             set { SetProperty(ref _IsBasePartOpenLightKB, value); }
         }
 
+        private bool _IsMesResult;
+
+        public bool IsMesResult
+        {
+            get { return _IsMesResult; }
+            set { SetProperty(ref _IsMesResult, value); }
+        }
+
         private string _ChooseScrewModel = "***********abc123****";
         /// <summary>
         /// 螺丝型号判断，如******123**，*为忽略字符

TeamAAS-VM/ViewModels/SettingViewModel.cs

@@ -1523,6 +1523,7 @@ namespace TeamAAS_VP.ViewModels
                 IsBasePartCodeChooseScrew = sys.IsBasePartCodeChooseScrew;
                 IsBasePartOpenLight = sys.IsBasePartOpenLight;
                 IsBasePartOpenLightKB = sys.IsBasePartOpenLightKB;
+                IsMesResult = sys.IsMesResult;
                 ChooseScrewModel = sys.ChooseScrewModel;
             }
 
@@ -1624,6 +1625,15 @@ namespace TeamAAS_VP.ViewModels
             set { SetProperty(ref _IsBasePartOpenLightKB, value); }
         }
 
+        private bool _IsMesResult;
+
+        public bool IsMesResult
+        {
+            get { return _IsMesResult; }
+            set { SetProperty(ref _IsMesResult, value); }
+        }
+
+
         private bool _IsBasePartCodeChooseScrew;
         /// <summary>
         /// 是否通过零件码判断螺丝型号
@@ -1815,6 +1825,7 @@ namespace TeamAAS_VP.ViewModels
                     sysConfig.ScrewCurvePath = ScrewCurvePath;
                     sysConfig.IsBasePartCodeGetSN = IsBasePartCodeGetSN;
                     sysConfig.IsBasePartCodeChooseScrew = IsBasePartCodeChooseScrew;
+                    sysConfig.IsMesResult = IsMesResult;
                     sysConfig.IsBasePartOpenLightKB = IsBasePartOpenLightKB;
                     sysConfig.IsBasePartOpenLight = IsBasePartOpenLight;
                     sysConfig.ChooseScrewModel = ChooseScrewModel;