From 45287b320a336177ae2398e8bd9d07dd7ed2718c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 24 四月 2024 14:09:52 +0800
Subject: [PATCH] 对色记录优化
---
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index f8868b1..73d3d35 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -31,6 +32,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_Query", 1, false, user))
{
@@ -52,12 +54,21 @@
ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckItemList");
}
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
@@ -241,6 +252,7 @@
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
long HQCCheckClassID = list[0].HQCCheckClassID;
+ string HDefaultResult = list[0].HDefaultResult;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -258,9 +270,9 @@
//涓昏〃
oCN.RunProc("Insert Into Gy_QCCheckItem " +
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HQCCheckClassID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HQCCheckClassID,HDefaultResult) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
- ",'"+ HLevel + "','0','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','鏈娇鐢�','"+ HQCCheckClassID + "')");
+ ",'"+ HLevel + "','0','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','鏈娇鐢�','"+ HQCCheckClassID + "','" + HDefaultResult + "')");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
if (list[0].HItemID.ToString() != "")
{
@@ -333,6 +345,7 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
+ string HDefaultResult = list[0].HDefaultResult;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -364,6 +377,7 @@
",HParentID=" + HParentID +
",HStopflag='" + HStopflag + "'" +
",HQCCheckClassID='" + HQCCheckClassID + "'" +
+ ",HDefaultResult='" + HDefaultResult + "'" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1