Merge branch 'master' of http://49.235.130.76/XXF_1122/DaisyNPILine

TeamAAS-VM/Core/FileHelper.cs

@@ -873,7 +873,7 @@ namespace TeamAAS_VP.Core
                 t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18,
                 r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18;
             //
-            string path = "E:\\Data\\产品数据\\";
+            string path = "D:\\Data\\产品数据\\";
             if (!Directory.Exists(path))
             {
                 Directory.CreateDirectory(path);

TeamAAS-VM/Core/Management.cs

@@ -1561,7 +1561,7 @@ namespace TeamAAS_VP.Core
                         {
                             SendTaskMessage(Lang.触发上相机检测拍照, MessageLevel.Debug);
                             //相机的编号
-                            Int16 cameraIndex = plc.ReadNode<Int16>(addressConfig.Out_UPCameracheckNum.Address);
+                            Int16 cameraIndex = plc.ReadNode<Int16>(addressConfig.In_UPCameracheckNum.Address);
                             SendTaskMessage(string.Format(Lang.编号0, cameraIndex), MessageLevel.Info);
 
                             //视觉流程ID
@@ -2511,7 +2511,7 @@ namespace TeamAAS_VP.Core
                 }
                 DateTime dt = DateTime.Now;
                 int number = lockResults.Count;//螺丝数量
-                string path = $"E:\\Data\\生产数据\\{dt.ToString("yyyy-MM")}\\{dt.ToString("yyyy-MM-dd")}.csv";
+                string path = $"D:\\Data\\生产数据\\{dt.ToString("yyyy-MM")}\\{dt.ToString("yyyy-MM-dd")}.csv";
                 StringBuilder sb = new StringBuilder();
                 //具体的ct需要优化
                 sb.Append($"{dt.ToString("yyyy-MM-dd HH:mm:ss")},{lockResults[0].ProductName},{Math.Round(ct, 3)},{rfid},{result},{lockResults[number - 1].NozzleNumber},{lockResults[number - 1].HeadNumber},");

TeamAAS-VM/Resources/Languages/Lang.resx

@@ -4062,21 +4062,22 @@
     <value>视觉静态精度分析</value>
   </data>
   <data name="点检螺丝" xml:space="preserve">
-    <value></value>
+    <value />
   </data>
   <data name="下压距离" xml:space="preserve">
     <value>下压距离</value>
   </data>
   <data name="ProcedureSaveImagePathModel_Month_Day_Formula_ProductSN_Time" xml:space="preserve">
     <value>年月/日/配方名/产品SN/产品SN+时间</value>
+    <comment>枚举</comment>
   </data>
   <data name="二维码拍照点位" xml:space="preserve">
     <value>二维码拍照点位</value>
   </data>
   <data name="二维码拍照请求" xml:space="preserve">
-    <value></value>
+    <value />
   </data>
   <data name="二维码拍照点位参数" xml:space="preserve">
-    <value></value>
+    <value />
   </data>
 </root>

TeamAAS-VM/Services/MesService.cs

@@ -126,7 +126,7 @@ namespace TeamAAS_VP.Services
                         // "SFC_OK" ´ú±íºÍ MES Á¬½Ó³É¹¦
                         if (text.Contains("SFC_OK"))
                         {
-                            if (text.Contains("unit_process_check=OK"))
+                            if (text.Contains("message=OK"))
                             {
                                 return (true, text);
                             }
@@ -202,7 +202,8 @@ namespace TeamAAS_VP.Services
                 }
             }
 
-            string res = isSuccess ? "PASS" : "FAIL";
+            //string res = isSuccess ? "PASS" : "FAIL";
+            string res = "PASS";
             string url = "";
             if (device.F=="PTL")
             {