From f3fe6442b68f39c35912de93835bb1f9b9675532 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 16 一月 2024 15:50:47 +0800
Subject: [PATCH] 检验项目新增 默认结论 字段，过滤方案
---
DAL/基础资料/公用基础资料/ClsXt_FastICScheme_Ctl.cs | 4 ++--
WebAPI/Controllers/基础资料/基础资料/Xt_FastICSchemeController.cs | 6 +++---
WebAPI/Models/CheckItem.cs | 1 +
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 7 +++++--
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsXt_FastICScheme_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsXt_FastICScheme_Ctl.cs"
index fdc23c3..5528cad 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsXt_FastICScheme_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsXt_FastICScheme_Ctl.cs"
@@ -27,7 +27,7 @@
#endregion 鑷畾涔夋柟娉�
//鏂板鍗曟嵁
- public bool AddBill(string HFilterIdLists, string HValue, string HElement_type, ref string sReturn)
+ public bool AddBill(string HFilterIdLists, string HValue, string HElement_type,string user, ref string sReturn)
{
try
{
@@ -35,7 +35,7 @@
//濡傛灉褰撳墠淇濆瓨鐨勮繃婊ゆ柟妗堣缃负浜� 榛樿鏂规锛屽垯鎶� 榛樿杩囨护鏂规鏍囪閮芥竻闄�
if (omodel.HUseingFlag == 1)
{
- oCn.RunProc("update Xt_FastICSchemeMain set HUseingFlag = 0");
+ oCn.RunProc("update Xt_FastICSchemeMain set HUseingFlag = 0 where HBillName ='" + omodel.HBillName + "' and HUserCode ='" + user + "'");
}
//涓昏〃
oCn.RunProc("Insert Into Xt_FastICSchemeMain " +
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);
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_FastICSchemeController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_FastICSchemeController.cs"
index 5b5f6d0..6badba2 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_FastICSchemeController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_FastICSchemeController.cs"
@@ -177,7 +177,7 @@
if (Convert.ToInt32(OperationType) == 1)
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- bResult = oBill.AddBill(HFilterIdLists, HValue, HElement_type, ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(HFilterIdLists, HValue, HElement_type, user, ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
@@ -221,13 +221,13 @@
/// </summary>
[Route("Xt_FastICScheme/SetDefaultScheme")]
[HttpGet]
- public object SetDefaultScheme(Int64 HInterID,string user)
+ public object SetDefaultScheme(Int64 HInterID,string user,string HModuleName)
{
try
{
oCN.BeginTran();
- oCN.RunProc("update Xt_FastICSchemeMain set HUseingFlag = 0");
+ oCN.RunProc("update Xt_FastICSchemeMain set HUseingFlag = 0 where HUserCode ='" + user + "' and HBillName = '" + HModuleName + "'");
oCN.RunProc("update Xt_FastICSchemeMain set HUseingFlag = 1 where HInterID = " + HInterID);
diff --git a/WebAPI/Models/CheckItem.cs b/WebAPI/Models/CheckItem.cs
index afb9aaf..fadcbf3 100644
--- a/WebAPI/Models/CheckItem.cs
+++ b/WebAPI/Models/CheckItem.cs
@@ -26,5 +26,6 @@
public long HQCCheckClassID { get; set; } //妫�楠岄」鐩被鍒獻D
public string HQCCheckClassName { get; set; }//妫�楠岄」鐩被鍒�
+ public string HDefaultResult { get; set; }//榛樿缁撹
}
}
\ No newline at end of file
--
Gitblit v1.9.1