冲突修复

MainForm/ClassFile/Inovance_EIP.cs

@@ -152,7 +152,7 @@ namespace EIP_Protocol
 
         [MarshalAs(UnmanagedType.I4)]
         public int nRemainCount;                             //上盖余料数
-
+        
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
         public float[] nCeJuData;           //测距
     }

MainForm/FaForm/Form_Home.cs

@@ -43,6 +43,7 @@ using NPOI.SS.Formula.Functions;
 using static MainForm.ClassFile.XiaomiAPI.XiaomiMqttClient_Extend;
 using System.Net.Http;
 using static MainForm.ClassFile.XiaomiAPI_MES.XiaomiMESHttp_UpLoadFile;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.Tab;
 
 /*
  * 注：本源码对外提供，所以有些地方使用中文命名方法及变量
@@ -70,16 +71,13 @@ namespace MainForm
         private const string BodyCheck = "工位点检数据";
         private const string BodyRun = "整线运行数据";
         private const string BodyAlarm = "整线报警数据";
-
         #endregion 常量
 
         #region 变量
-
         /// <summary>
         /// 委托-记录日志的方法
         /// </summary>
         public event HomeMessageHandler MessageEvent;
-
         /// <summary>
         /// 日志接口
         /// </summary>
@@ -1558,11 +1556,15 @@ namespace MainForm
                 try
                 {
                     XmMES_StationInResponse response = new XmMES_StationInResponse();
+                    string resultJson = "";
                     string mesRet = string.Empty;
                     int i = 0;
                     while (i < 2) // 1009会多次尝试上传
                     {
                         response = XiaomiMESHttp_StationInbound.StationIn(inRequest_Body);
+
+                        resultJson = JsonConvert.SerializeObject(response);
+
                         if (response != null && response.header.code == "200")
                             break;
                         else if (!mesRet.Contains("1009")) // 1009是未知错误
@@ -1572,21 +1574,20 @@ namespace MainForm
 
                         mesRet = $"[{response?.header?.code}]{response?.header?.desc}";
                         // 记录失败原因
-                        OnMessage(LogType.Error, "上传出站数据到MES服务器---失败！正在重新上传！接口报错信息：" + mesRet + "参数：" + json_Body);
+                        OnMessage(LogType.Error, $"上传出站数据到MES服务器---失败！正在重新上传！请求参数：{json_Body}，接口报错信息：" + mesRet);
                     }
-
-
+     
                     if (response?.header?.code == "200")
                     {
                         string sql_Upd = stationIn.ToStringUpdateStatusByID(1);
                         string ret_Upd = SQLHelper_New.ExecuteNonQuery(sql_Upd, null);
                         result = ret_Upd == "成功" ? 1 : 6;
-                        AddMessage(LogType.Info, $"【进站数据 SN {stationIn.Sn}】上传MES服务器---成功");
+                        AddMessage( LogType.Info, $"【进站数据 SN {stationIn.Sn}】上传MES服务器---成功,请求参数：{json_Body}，返回参数：{resultJson}");
                     }
                     else
                     {
                         result = 5;
-                        AddMessage(LogType.Info, $"【进站数据 SN {stationIn.Sn}】上传MES服务器---失败！接口报错信息：" + mesRet);
+                        AddMessage(LogType.Info, $"【进站数据 SN {stationIn.Sn}】上传MES服务器---失败！请求参数：{json_Body}，接口报错信息：" + mesRet);
                     }
 
                     string sql_response =
@@ -1622,12 +1623,10 @@ namespace MainForm
         private int SwitctProcessData(string stationNameStr, List<TestItem> items, string equipmentCode,
             string processItem,
             string workorder_code, string batch_num, string mtltmrk, string proDate,
-            string supplierCode, string sn, bool pass, string vehicleSn, string vehicleSlot, string MachineId,
-            string StationId, string PartBarcode, string direction = "")
+            string supplierCode, string sn, bool pass, string vehicleSn, string vehicleSlot, string MachineId, string StationId, string PartBarcode,string jsonParm, string direction="")
         {
-            return SaveProcessDataByDB(stationNameStr, items, equipmentCode, processItem, workorder_code, batch_num,
-                mtltmrk,
-                proDate, supplierCode, sn, pass, vehicleSn, vehicleSlot, MachineId, StationId, PartBarcode, direction);
+            return SaveProcessDataByDB(stationNameStr, items, equipmentCode, processItem, workorder_code, batch_num, mtltmrk,
+                proDate, supplierCode, sn, pass, vehicleSn, vehicleSlot, MachineId, StationId, PartBarcode, jsonParm, direction);
         }
 
         /// <summary>
@@ -1645,8 +1644,7 @@ namespace MainForm
         /// <returns>上传成功时返回1；失败返回0</returns>
         public int SaveProcessDataByDB(string stationNameStr, List<TestItem> items, string equipmentCode,
             string processItem, string workorder_code, string batch_num, string mtltmrk,
-            string proDate, string supplierCode, string sn, bool pass, string vehicleSn, string vehicleSlot,
-            string machineId, string stationId, string partBarcode, string jsonProcessParm, string direction = "")
+            string proDate, string supplierCode, string sn, bool pass, string vehicleSn, string vehicleSlot, string machineId, string stationId, string partBarcode,string jsonParm,string direction="")
         {
             int upload = 0;
             int result = 0;
@@ -2903,11 +2901,10 @@ namespace MainForm
                     Parameter_value = sn,
                     Parameter_unit = ""
                 });
-
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
                 //出站接口
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                    MachineId, StationId, "");
+    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1", MachineId, StationId, "", paramJson);
 
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
 
@@ -3304,10 +3301,10 @@ namespace MainForm
                     Parameter_unit = ""
                 });
 
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
 
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                    MachineId, StationId, PartBarcode);
+   , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1", MachineId, StationId, PartBarcode, paramJson);
 
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
 
@@ -3822,9 +3819,9 @@ namespace MainForm
                 int result1 = 1;
                 //if (direction == "Right")
                 //{ 
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
                 result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                    MachineId, StationId, "", direction);
+   , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1", MachineId, StationId, "", paramJson, direction);
                 //}
 
 
@@ -4220,10 +4217,9 @@ namespace MainForm
                     Parameter_value = sn,
                     Parameter_unit = ""
                 });
-
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                    MachineId, StationId, "");
+   , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1", MachineId, StationId, "", paramJson);
 
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
 
@@ -4726,10 +4722,9 @@ namespace MainForm
                     Parameter_value = sn,
                     Parameter_unit = ""
                 });
-
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                    MachineId, StationId, PartBarcode);
+   , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1", MachineId, StationId, PartBarcode, paramJson);
 
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
 
@@ -5234,10 +5229,9 @@ namespace MainForm
                     Parameter_value = sn,
                     Parameter_unit = ""
                 });
-
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                    MachineId, StationId, "");
+    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1", MachineId, StationId, "", paramJson);
 
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
 
@@ -5895,12 +5889,13 @@ namespace MainForm
                 });
 
                 int result1 = 1;
-                if (direction == "Right")
-                {
-                    SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                        , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                        MachineId, StationId, "");
-                }
+                //if (direction == "Right")
+                //{ 
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
+                SwitctProcessData(stationNameStr, items, equipmentCode, processItem , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode
+                    , sn, pass, CarrierBarcode, "1", MachineId, StationId, "", paramJson);
+                   
+                //}
 
                 //if (direction == "Left")
                 //{
@@ -6429,9 +6424,9 @@ namespace MainForm
                     Parameter_unit = ""
                 });
 
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                    MachineId, StationId, "");
+   , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1", MachineId, StationId, "", paramJson);
 
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
 
@@ -6927,10 +6922,9 @@ namespace MainForm
                     Parameter_value = sn,
                     Parameter_unit = ""
                 });
-
+                string paramJson = JsonConvert.SerializeObject(stPLC_MesData.mesData);
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1",
-                    MachineId, StationId, "");
+   , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "1", MachineId, StationId, "", paramJson);
 
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
 
@@ -7779,7 +7773,7 @@ namespace MainForm
                     Parameter_value = a1Result == 1 ? "OK" : "NG",
                     Parameter_unit = ""
                 });
-                int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
+                int result1 = SwitctProcessData_old(stationNameStr, items, equipmentCode, processItem
                     , workorder_code, mtltmrk, partNo1, pass, sn, "1");
 
                 // 产品2
@@ -7802,7 +7796,7 @@ namespace MainForm
                     Parameter_value = a1Result == 1 ? "OK" : "NG",
                     Parameter_unit = ""
                 });
-                int result2 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
+                int result2 = SwitctProcessData_old(stationNameStr, items, equipmentCode, processItem
                     , workorder_code, mtltmrk, partNo2, pass, sn, "2");
 
                 short result = 0;
@@ -8938,8 +8932,8 @@ namespace MainForm
                         Parameter_value = b1Part1Result == 1 ? "OK" : "NG",
                         Parameter_unit = ""
                     });
-                    result1 = SwitctProcessData(stationNameStr, items1, equipmentCode, processItem
-                        , workorder_code, mtltmrk, b1ProductSN1, pass1, b1ProductSN, "1");
+                    result1 = SwitctProcessData_old(stationNameStr, items1, equipmentCode, processItem
+                   , workorder_code, mtltmrk, b1ProductSN1, pass1, b1ProductSN, "1");
                 }
 
                 // 产品2
@@ -8967,7 +8961,7 @@ namespace MainForm
                         Parameter_value = b1Part2Result == 1 ? "OK" : "NG",
                         Parameter_unit = ""
                     });
-                    result2 = SwitctProcessData(stationNameStr, items2, equipmentCode, processItem
+                    result2 = SwitctProcessData_old(stationNameStr, items2, equipmentCode, processItem
                         , workorder_code, mtltmrk, b1ProductSN2, pass2, b1ProductSN, "2");
                 }
 
@@ -9908,8 +9902,8 @@ namespace MainForm
                     Parameter_unit = ""
                 });
 
-                int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
-                    , workorder_code, mtltmrk, productSN, pass, sn, "1");
+                int result1 = SwitctProcessData_old(stationNameStr, items, equipmentCode, processItem
+                        , workorder_code, mtltmrk, productSN, pass, sn, "1");
                 short result = (short)result1;
                 stopwatch2.Stop();
 
@@ -11075,7 +11069,7 @@ namespace MainForm
                             Parameter_unit = ""
                         });
 
-                        int result1 = SwitctProcessData(stationNameStr, items1, equipmentCode, processItem
+                        int result1 = SwitctProcessData_old(stationNameStr, items1, equipmentCode, processItem
                             , workorder_code, mtltmrk, partNos[i], pass, sn, index);
 
                         results.Add(result1);
@@ -11650,7 +11644,7 @@ namespace MainForm
                             Parameter_unit = ""
                         });
 
-                        int result1 = SwitctProcessData(stationNameStr, items1, equipmentCode, processItem
+                        int result1 = SwitctProcessData_old(stationNameStr, items1, equipmentCode, processItem
                             , workorder_code, mtltmrk, partNos[i], isPass, sn, index);
 
                         results.Add(result1);
@@ -12020,7 +12014,7 @@ namespace MainForm
                             Parameter_unit = ""
                         });
 
-                        int result1 = SwitctProcessData(stationNameStr, items1, equipmentCode, processItem
+                        int result1 = SwitctProcessData_old(stationNameStr, items1, equipmentCode, processItem
                             , workorder_code, mtltmrk, partNos[i], isPass, sn, index);
 
                         results.Add(result1);
@@ -12420,7 +12414,7 @@ namespace MainForm
                             Parameter_unit = ""
                         });
 
-                        int result1 = SwitctProcessData(stationNameStr, items1, equipmentCode, processItem
+                        int result1 = SwitctProcessData_old(stationNameStr, items1, equipmentCode, processItem
                             , workorder_code, mtltmrk, partNos[i], pass, sn, index);
                         results.Add(result1);
                     }
@@ -13086,7 +13080,7 @@ namespace MainForm
                     Parameter_unit = ""
                 });
 
-                int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
+                int result1 = SwitctProcessData_old(stationNameStr, items, equipmentCode, processItem
                     , workorder_code, mtltmrk, partNo, pass, sn, "1");
                 //int result = result1 == 1 ? 1 : (GlobalContext.IsSendProcessData ? 4 : 1);
                 short result = result1 == 1 ? (short)1 : (short)3;

MainForm/FaForm/Form_Home_SaveData.cs

@@ -170,7 +170,7 @@ namespace MainForm
         /// <param name="vehicleSn">载具SN</param>
         /// <param name="vehicleSlot">载具穴号</param>
         /// <returns>上位机发送1代表OK；2代表上传客户MES失败；3代表上位机保存数据失败；4代表上位机报警；</returns>
-        private int SwitctProcessData(string stationNameStr, List<TestItem> items, string equipmentCode, string processItem,
+        private int SwitctProcessData_old(string stationNameStr, List<TestItem> items, string equipmentCode, string processItem,
             string workorder_code, string mtltmrk, string sn, bool pass, string vehicleSn, string vehicleSlot)
         {
             //if (DataSwitch == 1)