增加csv添加螺丝编号

TeamAAS-VM/Core/Management.cs

@@ -2511,6 +2511,7 @@ namespace TeamAAS_VP.Core
                                                         DFC.Add(new DataFormCtq
                                                         {
                                                             PPID = ProductMainSN[i],
+                                                            ScrewNum = lockResult.Number,
                                                             PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
                                                             PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
                                                             CTQ_NAME = "Torque",
@@ -2524,7 +2525,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = torqueRes ? "Pass" : "Fail",
+                                                            PROCESS_OUTCOME = torqueRes ? "PASS" : "FAIL",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "kgf.cm",
                                                             ERROR_MESSAGE = torqueRes ? "" : "Torque_Spec OOS"
@@ -2532,6 +2533,7 @@ namespace TeamAAS_VP.Core
                                                         DFC.Add(new DataFormCtq
                                                         {
                                                             PPID = ProductMainSN[i],
+                                                            ScrewNum = lockResult.Number,
                                                             PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
                                                             PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
                                                             CTQ_NAME = "Turn",
@@ -2545,7 +2547,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = turnRes ? "Pass" : "Fail",
+                                                            PROCESS_OUTCOME = turnRes ? "PASS" : "FAIL",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "圈",
                                                             ERROR_MESSAGE = turnRes ? "" : "Turn_Spec OOS"
@@ -2553,6 +2555,7 @@ namespace TeamAAS_VP.Core
                                                         DFC.Add(new DataFormCtq
                                                         {
                                                             PPID = ProductMainSN[i],
+                                                            ScrewNum = lockResult.Number,
                                                             PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
                                                             PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
                                                             CTQ_NAME = "Pressure",
@@ -2566,7 +2569,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = pressureRes ? "Pass" : "Fail",
+                                                            PROCESS_OUTCOME = pressureRes ? "PASS" : "FAIL",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "N",
                                                             ERROR_MESSAGE = pressureRes ? "" : "Pressure_Spec OOS"
@@ -3244,7 +3247,7 @@ namespace TeamAAS_VP.Core
                 StringBuilder sb = new StringBuilder();
                 if (!File.Exists(fullPath))
                 {
-                    sb.Append("PPID,PROCESS_NAME,PROCESS_START_TIME,CTQ_NAME,CTQ_VALUE,CTQ_LSL,CTQ_USL,PROCESS_END_TIME,SUPPLIER_NAME,COMMODITY_TYPE,REVISION,WO#,MFG_LOT#," +
+                    sb.Append("PPID,Screw_Number,PROCESS_NAME,PROCESS_START_TIME,CTQ_NAME,CTQ_VALUE,CTQ_LSL,CTQ_USL,PROCESS_END_TIME,SUPPLIER_NAME,COMMODITY_TYPE,REVISION,WO#,MFG_LOT#," +
                         "MFG_ASSY_LINE,PROCESS_OUTCOME,PROCESS_MACHINE_ID,CTQ_UNIT_OF_MEASURE,ERROR_MESSAGE");
                     sb.AppendLine();
                 }
@@ -3254,7 +3257,7 @@ namespace TeamAAS_VP.Core
                 }
                 foreach (var dfc in dfcs)
                 {
-                    sb.Append($"{dfc.PPID},{dfc.PROCESS_NAME},{dfc.PROCESS_START_TIME},{dfc.CTQ_NAME},{dfc.CTQ_VALUE:F3},{dfc.CTQ_LSL:F3},{dfc.CTQ_USL:F3},{dfc.PROCESS_END_TIME},{dfc.SUPPLIER_NAME},{dfc.COMMODITY_TYPE},{dfc.REVISION},{dfc.WO},{dfc.MFG_LOT},{dfc.MFG_ASSY_LINE},{dfc.PROCESS_OUTCOME},{dfc.PROCESS_MACHINE_ID},{dfc.CTQ_UNIT_OF_MEASURE},{dfc.ERROR_MESSAGE}");
+                    sb.Append($"{dfc.PPID},{dfc.ScrewNum},{dfc.PROCESS_NAME},{dfc.PROCESS_START_TIME},{dfc.CTQ_NAME},{dfc.CTQ_VALUE:F3},{dfc.CTQ_LSL:F3},{dfc.CTQ_USL:F3},{dfc.PROCESS_END_TIME},{dfc.SUPPLIER_NAME},{dfc.COMMODITY_TYPE},{dfc.REVISION},{dfc.WO},{dfc.MFG_LOT},{dfc.MFG_ASSY_LINE},{dfc.PROCESS_OUTCOME},{dfc.PROCESS_MACHINE_ID},{dfc.CTQ_UNIT_OF_MEASURE},{dfc.ERROR_MESSAGE}");
                     sb.AppendLine();
                 }
                 // 使用 StreamWriter 以追加模式打开文件

TeamAAS-VM/Models/DataFormCtq.cs

@@ -15,6 +15,12 @@ namespace TeamAAS_VP.Models
         /// </summary>
         public string PPID { get => _PPID; set => SetProperty(ref _PPID, value); }
 
+        private int _ScrewNum;
+        /// <summary>
+        /// 螺丝编号
+        /// </summary>
+        public int ScrewNum { get => _ScrewNum; set => SetProperty(ref _ScrewNum, value); }
+
         private string _PROCESS_NAME;
         /// <summary>
         /// 设备名称