From 2568dccd86ae777f49dcf9c23e5ddd5a55bc2795 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 06 十一月 2024 12:10:36 +0800
Subject: [PATCH] 森楷其他入库模块扫条码同步入库申请单
---
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
index bec08dd..de7e222 100644
--- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
@@ -463,10 +463,10 @@
}
#endregion
- #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
- [Route("Gy_QCCheckClass/Gy_Process_Excel")]
+ #region 鏍￠獙椤圭洰鍒嗙被鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_QCCheckClass/Gy_QCCheckClass_Excel")]
[HttpPost]
- public json Gy_Process_Excel()
+ public json Gy_QCCheckClass_Excel()
{
json res = new json();
try
@@ -492,7 +492,8 @@
{
provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
}
-
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ provisional.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
//娣诲姞鏁版嵁
for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
{
@@ -517,12 +518,39 @@
for (int i = 0; i <= provisional.Rows.Count - 1; i++)
{
- string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["浠ｇ爜"].ToString());
- string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍚嶇О"].ToString());
- string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
- string HRemark = 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());
//鑾峰彇鐪熷疄琛屾暟
int line = i + 1;
+ if (HORGNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "绗�" + line + "琛�,缁勭粐涓嶅瓨鍦紒";
+ res.data = null;
+ return res;
+ }
+ else
+ {
+ provisional.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "绗�" + line + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ res.data = null;
+ return res;
+ }
}
res.code = "1";
@@ -551,17 +579,29 @@
var 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_QCCheckClass/Gy_Process_btnSave")]
+ #region 鏍￠獙椤圭洰鍒嗙被鍒楄〃 瀵煎叆(淇濆瓨)
+ [Route("Gy_QCCheckClass/Gy_QCCheckClass_btnSave")]
[HttpPost]
public object Gy_Group_btnSave([FromBody] JObject sMainSub)
{
@@ -573,7 +613,7 @@
string organ = sArray[2].ToString();
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckClass_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -599,8 +639,9 @@
int i = 1;
foreach (Dictionary<string, string> item in list)
{
- string HNumber = item["浠ｇ爜"].ToString();
- string HName = item["鍚嶇О"].ToString();
+ string HNumber = item["妫�楠岄」鐩垎绫讳唬鐮�"].ToString();
+ string HUSEORGID = item["HOrgID"].ToString();
+ string HName = item["妫�楠岄」鐩垎绫�"].ToString();
string HHelpCode = item["鍔╄鐮�"];
string HRemark = item["澶囨敞"].ToString();
@@ -633,12 +674,12 @@
{
string sql = "insert into Gy_QCCheckClass (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
- $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{HUSEORGID}', '{HUSEORGID}', '{System.DateTime.Now.ToString("G")}', '{user}')";
oCN.RunProc(sql);
}
else
{
- oCN.RunProc("update Gy_QCCheckClass set HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "'where HNumber='" + HNumber + "'");
+ oCN.RunProc("update Gy_QCCheckClass set HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "',HUSEORGID="+ HUSEORGID + ",HRemark='"+HRemark+"' where HNumber='" + HNumber + "'");
}
i++;
--
Gitblit v1.9.1