优化取值

UAS_MES_YTDZ/FunctionCode/Make/Make_BodyTest.cs

@@ -124,14 +124,75 @@ namespace UAS_MES_NEW.Make
                     DateTime.TryParse(EventTime, out DateTime dtHour);
                     string timeType = dtHour.Hour < 11 ? "上午" : "下午";
 
+                    JObject ESDResult = JObject.Parse(item["ESDResult"].ToString());
+                    string BT_HANDRES = ESDResult.Value<string>("Hand");
+                    string BT_DHANDRES = ESDResult.Value<string>("DHand");
+                    string BT_LEFTSHOESRES = ESDResult.Value<string>("LeftShoes");
+                    string BT_RIGHTSHOESRES = ESDResult.Value<string>("RightShoes");
+
+
+                    JObject ESDResistance = JObject.Parse(item["ESDResistance"].ToString());
+                    string BT_HAND = ESDResistance.Value<string>("Hand");
+                    string BT_DHAND = ESDResistance.Value<string>("DHand");
+                    string BT_LEFTSHOES = ESDResistance.Value<string>("LeftShoes");
+                    string BT_RIGHTSHOES = ESDResistance.Value<string>("RightShoes");
+
+                    string testType = "";
+                    switch (item["ESDMode"].ToString())
+                    {
+                        case "0":
+                            testType = "免检";
+                            break;
+
+                        case "1":
+                            testType = "单线手";
+                            break;
+                        case "2":
+                            testType = "双线手";
+                            break;
+                        case "3":
+                            testType = "左鞋";
+                            break;
+                        case "4":
+                            testType = "右鞋";
+                            break;
+                        case "5":
+                            testType = "单线手 + 左鞋";
+                            break;
+                        case "6":
+                            testType = "双线手 + 左鞋";
+                            break;
+                        case "7":
+                            testType = "单线手 + 右鞋";
+                            break;
+                        case "8":
+                            testType = "双线手 + 右鞋";
+                            break;
+                        case "9":
+                            testType = "双鞋";
+                            break;
+                        case "10":
+                            testType = "单线手全测";
+                            break;
+                        case "11":
+                            testType = "双线手全测";
+                            break;
+                        default:
+                            break;
+                    }
 
                     dt = (DataTable)dh.ExecuteSql($"select * from bodytest where BT_EVENTID = '{EventID}'", "select");
+                    Console.WriteLine();
                     if (dt.Rows.Count == 0)
                     {
                         string sql = $@"INSERT INTO BODYTEST (BT_ID,BT_DEPTNAME,BT_EMPNO,BT_EMP,BT_TYPE,BT_TIMETYPE,
-                            BT_HAND,BT_DHAND,BT_LEFTSHOES,BT_RIGHTSHOES,BT_CONTROLNAME,BT_EVENTID,BT_INDATE) VALUES 
+                            BT_CONTROLNAME,BT_EVENTID,BT_INDATE,BT_TESTTYPE,
+                            BT_HAND, BT_DHAND, BT_LEFTSHOES, BT_RIGHTSHOES,
+                            BT_HANDRES,BT_DHANDRES,BT_LEFTSHOESRES,BT_RIGHTSHOESRES) VALUES 
                             (BODYTEST_SEQ.NEXTVAL,'{DeptName}','{EmployeeCode}','{EmployeeName}','{EventName}','{timeType}',
-                            '','','','','{ControlName}','{EventID}',to_date('{EventTime}', 'YYYY-MM-DD HH24:MI:SS'))";
+                            '{ControlName}','{EventID}',to_date('{EventTime}', 'YYYY-MM-DD HH24:MI:SS'),'{testType}',
+                            '{BT_HAND}','{BT_DHAND}','{BT_LEFTSHOES}','{BT_RIGHTSHOES}',
+                            '{BT_HANDRES}','{BT_DHANDRES}','{BT_LEFTSHOESRES}','{BT_RIGHTSHOESRES}')";
 
                         dh.ExecuteSql(sql, "insert");
                         InsertNum += 1;