From 2f6f2d57f37b1992d1b0d26a21c2257ce9e2b2c9 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 04 十月 2024 18:55:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 65 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index b5e70f5..6dcf2d9 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -643,9 +643,9 @@
#endregion
#region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
- [Route("Gy_CheckItem/Gy_Process_Excel")]
+ [Route("Gy_CheckItem/Gy_CheckItem_Excel")]
[HttpPost]
- public json Gy_Process_Excel()
+ public json Gy_CheckItem_Excel()
{
json res = new json();
try
@@ -674,7 +674,7 @@
//妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
provisional.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
- provisional.Columns.Add("HDeptID", typeof(Int32));//閮ㄩ棬ID
+ provisional.Columns.Add("HQCCheckClassID", typeof(Int32));//妫�楠岄」鐩垎绫籌D
//娣诲姞鏁版嵁
for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
@@ -700,22 +700,20 @@
for (int i = 0; i <= provisional.Rows.Count - 1; i++)
{
- string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["浠ｇ爜"].ToString());
- string HUSEORGID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐浠ｇ爜"].ToString());
- string HQCCheckClassID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩被鍒唬鐮�"].ToString());
- string HQCCheckClassName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩被鍒悕绉�"].ToString());
- string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍚嶇О"].ToString());
+ string HCheckItemName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩�"].ToString());
+ string HCheckItemNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩唬鐮�"].ToString());
+ string HQCCheckClassName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩垎绫�"].ToString());
+ string HQCCheckClassNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩垎绫讳唬鐮�"].ToString());
+ string HORGNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐浠ｇ爜"].ToString());
string HORGName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐鍚嶇О"].ToString());
- string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
- string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
//鑾峰彇鐪熷疄琛屾暟
int line = i + 1;
- if (HUSEORGID != "")
+ if (HORGNumber != "")
{
//鏌ヨ缁勭粐
- ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HUSEORGID + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
if (ds.Tables[0].Rows.Count == 0)
{
@@ -731,8 +729,8 @@
}
string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
- //鏌ヨ妫�楠岄」鐩槸鍚﹀瓨鍦�
- DataSet checkClass = oCN.RunProcReturn("select * from Gy_QCCheckClass where HNumber = '" + HQCCheckClassID + "' and HName = '" + HQCCheckClassName + "'", "Gy_QCCheckClass");
+ //鏌ヨ妫�楠岄」鐩垎绫绘槸鍚﹀瓨鍦�
+ DataSet checkClass = oCN.RunProcReturn("select * from Gy_QCCheckClass where HNumber = '" + HQCCheckClassNumber + "' and HName = '" + HQCCheckClassName + "'", "Gy_QCCheckClass");
if (checkClass.Tables[0].Rows.Count == 0)
{
res.code = CodeConstant.FAIL;
@@ -740,6 +738,10 @@
res.Message = "绗�" + line + "琛�,妫�楠岄」鐩笉瀛樺湪锛�";
res.data = null;
return res;
+ }
+ else
+ {
+ provisional.Rows[i]["HQCCheckClassID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
}
}
else
@@ -781,14 +783,32 @@
if (!provisional.Columns.Contains("缁勭粐浠ｇ爜"))
error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
- if(!provisional.Columns.Contains("妫�楠岄」鐩被鍒悕绉�"))
- error += "娌℃湁鎵惧埌銆愭楠岄」鐩被鍒悕绉般�戠殑鏍囬,";
+ if(!provisional.Columns.Contains("妫�楠岄」鐩垎绫讳唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愭楠岄」鐩垎绫讳唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�楠岄」鐩垎绫�"))
+ error += "娌℃湁鎵惧埌銆愭楠岄」鐩垎绫汇�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�楠岄」鐩�"))
+ error += "娌℃湁鎵惧埌銆愭楠岄」鐩�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�楠岄」鐩唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愭楠岄」鐩唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("鍔╄鐮�"))
+ error += "娌℃湁鎵惧埌銆愬姪璁扮爜銆戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愬娉ㄣ�戠殑鏍囬,";
return error;
}
#endregion
#region 鏍￠獙椤圭洰鍒楄〃 瀵煎叆(淇濆瓨)
- [Route("Gy_CheckItem/Gy_Process_btnSave")]
+ [Route("Gy_CheckItem/Gy_CheckItem_btnSave")]
[HttpPost]
public object Gy_Group_btnSave([FromBody] JObject sMainSub)
{
@@ -799,7 +819,7 @@
string user = sArray[1].ToString();
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -825,12 +845,11 @@
int i = 1;
foreach (Dictionary<string, string> item in list)
{
- string HNumber = item["浠ｇ爜"].ToString();
- string HUSEORGID = item["缁勭粐浠ｇ爜"].ToString();
- string HName = item["鍚嶇О"].ToString();
- string HORGName = item["缁勭粐鍚嶇О"].ToString();
+ string HNumber = item["妫�楠岄」鐩唬鐮�"].ToString();
+ string HUSEORGID = item["HOrgID"].ToString();
+ string HName = item["妫�楠岄」鐩�"].ToString();
string HHelpCode = item["鍔╄鐮�"];
- string HQCCheckClassID = item["妫�楠岄」鐩被鍒唬鐮�"];
+ string HQCCheckClassID = item["HQCCheckClassID"];
string HRemark = item["澶囨敞"].ToString();
string sShortNumber;
--
Gitblit v1.9.1