From 6610c21cc50c942e280d98f1787605265f5adb2c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 23 五月 2024 10:55:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 184 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 182 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index 9c3eb9f..f62fb7d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -19,6 +19,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ public DAL.ClsGy_QCCheckItem_Ctl BillOld = new DAL.ClsGy_QCCheckItem_Ctl();
#region 妫�楠岄」鐩垪琛ㄦ暟鎹�
/// <summary>
@@ -252,6 +253,19 @@
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
long HQCCheckClassID = list[0].HQCCheckClassID;
+ string HDefaultResult = list[0].HDefaultResult;
+
+ long HUnitID = list[0].HUnitID;
+ string HAnalysisMethod = list[0].HAnalysisMethod;
+ string HDefectLevel = list[0].HDefectLevel;
+ long HDestructInspect = list[0].HDestructInspect;
+ long HKeyInspect = list[0].HKeyInspect;
+ long HQualityStdID = list[0].HQualityStdID;
+ long HInspectMethodID = list[0].HInspectMethodID;
+ long HInspectInstruMentID = list[0].HInspectInstruMentID;
+ long HInspectBasisID = list[0].HInspectBasisID;
+ long HSampleSchemeID = list[0].HSampleSchemeID;
+ long HISsystemSet = list[0].HISsystemSet;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -269,9 +283,13 @@
//涓昏〃
oCN.RunProc("Insert Into Gy_QCCheckItem " +
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HQCCheckClassID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HQCCheckClassID,HDefaultResult" +
+ ",HAnalysisMethod,HDefectLevel,HUnitID,HDestructInspect,HKeyInspect,HQualityStdID" +
+ ",HInspectMethodID,HInspectInstruMentID,HInspectBasisID,HSampleSchemeID,HISsystemSet) " +
" 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 +
+ "','" + HAnalysisMethod + "','" + HDefectLevel + "'," + HUnitID + "," + HDestructInspect + "," + HKeyInspect + "," + HQualityStdID +
+ "," + HInspectMethodID + "," + HInspectInstruMentID + "," + HInspectBasisID + "," + HSampleSchemeID + "," + HISsystemSet + ")");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
if (list[0].HItemID.ToString() != "")
{
@@ -345,6 +363,19 @@
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
+ string HDefaultResult = list[0].HDefaultResult;
+ long HUnitID = list[0].HUnitID;
+ string HAnalysisMethod = list[0].HAnalysisMethod;
+ string HDefectLevel = list[0].HDefectLevel;
+ long HDestructInspect = list[0].HDestructInspect;
+ long HKeyInspect = list[0].HKeyInspect;
+ long HQualityStdID = list[0].HQualityStdID;
+ long HInspectMethodID = list[0].HInspectMethodID;
+ long HInspectInstruMentID = list[0].HInspectInstruMentID;
+ long HInspectBasisID = list[0].HInspectBasisID;
+ long HSampleSchemeID = list[0].HSampleSchemeID;
+ long HISsystemSet = list[0].HISsystemSet;
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -375,6 +406,20 @@
",HParentID=" + HParentID +
",HStopflag='" + HStopflag + "'" +
",HQCCheckClassID='" + HQCCheckClassID + "'" +
+ ",HDefaultResult='" + HDefaultResult + "'" +
+
+ ",HAnalysisMethod='" + HAnalysisMethod + "'" +
+ ",HDefectLevel='" + HDefectLevel + "'" +
+ ",HUnitID='" + HUnitID + "'" +
+ ",HDestructInspect='" + HDestructInspect + "'" +
+ ",HKeyInspect='" + HKeyInspect + "'" +
+ ",HQualityStdID='" + HQualityStdID + "'" +
+ ",HInspectMethodID='" + HInspectMethodID + "'" +
+ ",HInspectInstruMentID='" + HInspectInstruMentID + "'" +
+ ",HInspectBasisID='" + HInspectBasisID + "'" +
+ ",HSampleSchemeID='" + HSampleSchemeID + "'" +
+ ",HISsystemSet='" + HISsystemSet + "'" +
+
",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);
@@ -431,6 +476,37 @@
}
#endregion
+ #region 妫�楠岄」鐩慨鏀硅幏鍙栫粦瀹氭暟鎹鍥�
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_CheckItem/xg_View")]
+ [HttpGet]
+ public object xg_View(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckItemList_Edit where HItemID=" + HInterID, "h_v_Gy_QCCheckItemList_Edit");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 妫�楠岄」鐩幏鍙栨爲鍨嬪垪琛ㄦ暟鎹�
[Route("Gy_CheckItem/LoadTree")]
[HttpGet]
@@ -458,5 +534,109 @@
}
}
#endregion
+
+ #region 妫�楠岄」鐩鏍�/鍙嶅鏍�
+ [Route("Gy_CheckItem/AuditGy_CheckItem")]
+ [HttpGet]
+ public object AuditGy_CheckItem(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from Gy_QCCheckItem where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0].Rows[0]["HCheckEmp"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍗曟嵁
+ if (!BillOld.AuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from Gy_QCCheckItem where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"] == null || ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿崟鎹�
+ if (!BillOld.DeAuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
--
Gitblit v1.9.1