From ff1f14aa3e83bf9084991c2e411f1d838a9ba81b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 24 一月 2024 09:51:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index 9c3eb9f..73d3d35 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -252,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))
{
@@ -269,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() != "")
{
@@ -344,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))
{
@@ -375,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