From b8f6235347ad2690727347e6ffa4693606d80b7d Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 16 十月 2025 11:24:51 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 270 ++++++++++++++++++++++++++---------------------------
1 files changed, 134 insertions(+), 136 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index da05301..bb1f158 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -46,7 +46,8 @@
objJsonResult.data = null;
return objJsonResult;
}
- string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
+ //string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
+ string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 1=1 ");
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn(sql1 + sWhere + "order by 閮ㄩ棬浠ｇ爜", "h_v_IF_DepartmentList");
@@ -65,24 +66,24 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- if (ds.Tables[0].Rows.Count > 0 && ds != null)
- {
+ //if (ds.Tables[0].Rows.Count > 0 && ds != null)
+ //{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏌ヨ鍒伴儴闂ㄦ暟鎹紝璇疯仈绯荤郴缁熺鐞嗗憳杩涜鏍稿";
- objJsonResult.data = ds.Tables[0];
- objJsonResult.list = columnNameList;
- return objJsonResult;
- }
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ヨ鍒伴儴闂ㄦ暟鎹紝璇疯仈绯荤郴缁熺鐞嗗憳杩涜鏍稿";
+ // objJsonResult.data = ds.Tables[0];
+ // objJsonResult.list = columnNameList;
+ // return objJsonResult;
+ //}
}
@@ -177,37 +178,7 @@
}
}
- #endregion
-
-
- #region 璁惧鍒嗗竷 鐢熶骇璧勬簮瀵瑰簲鐨勮鍗�
-
- [Route("Sc_OrderStateDistribution/Sc_OrderStateDistribution_Souce")]
- [HttpGet]
- public object Sc_OrderStateDistribution_Souce(string sWhere,string user,int OrganizationID)
- {
- try
- {
- string sql1 = string.Format("exec h_p_sc_HDeptSouceMOList {0},{1}", sWhere, OrganizationID);
-
- ds = oCN.RunProcReturn(sql1, "h_p_sc_HDeptSouceMOList");
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds;
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
+ #endregion
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
@@ -552,6 +523,8 @@
//DateTime HCheckDate = list[0].HCheckDate;
string HDeleteMan = list[0].HDeleteMan;
//DateTime HDeleteDate = list[0].HDeleteDate;
+ bool HWorkShopFlag = list[0].HWorkShopFlag;
+ long HEmpQtys = list[0].HEmpQtys;
//鏈骇鏍囧織
bool HEndFlag = true;
long HEntityID = 1;
@@ -592,7 +565,7 @@
return objJsonResult;
}
}
-
+
//鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
@@ -621,7 +594,17 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("Select HItemID from Gy_Department Where HItemID<>" + HItemID + " and HNumber='" + HNumber + "' and HUSEORGID=" + HUseOrgID, "Gy_Warehouse");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HItemID == 0)
@@ -630,10 +613,10 @@
oCN.BeginTran();
oCN.RunProc("Insert into Gy_Department " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime,HWorkShopFlag,HEmpQtys) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
- "," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate(),"+ Convert.ToString(HWorkShopFlag ? 1 : 0) + ","+ HEmpQtys + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -641,6 +624,19 @@
else
{
oCN.BeginTran();
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Warehouse");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//涓昏〃
oCN.RunProc("Update Gy_Department set " +
" HNumber='" + HNumber + "'" +
@@ -656,6 +652,8 @@
",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
",HUpDater='" + HUpDater + "'" +
",HUpDateDate= getdate()" +
+ ",HWorkShopFlag=" + Convert.ToString(HWorkShopFlag ? 1 : 0) +
+ ",HEmpQtys=" + HEmpQtys.ToString() +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -1166,95 +1164,95 @@
#endregion
#region 閮ㄩ棬鍒楄〃 鏂囦欢涓婁紶
- [Route("Gy_Department/Gy_Process_Excel")]
- [HttpPost]
- public json Gy_Department_Excel()
- {
- json res = new json();
- try
- {
- //鑾峰彇鏂囦欢鍚嶇О
- var file = HttpContext.Current.Request.Files[0];
- //鑾峰彇鏂囦欢鐗╃悊璺緞
- string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
- //淇濆瓨鏂囦欢
- file.SaveAs(ExcelPath);
+ //[Route("Gy_Department/Gy_Process_Excel")]
+ //[HttpPost]
+ //public json Gy_Department_Excel()
+ //{
+ // json res = new json();
+ // try
+ // {
+ // //鑾峰彇鏂囦欢鍚嶇О
+ // var file = HttpContext.Current.Request.Files[0];
+ // //鑾峰彇鏂囦欢鐗╃悊璺緞
+ // string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ // //淇濆瓨鏂囦欢
+ // file.SaveAs(ExcelPath);
- NpoiHelper np = new NpoiHelper();
- DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+ // NpoiHelper np = new NpoiHelper();
+ // DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
- //鍒犻櫎鏂囦欢
- File.Delete(ExcelPath);
+ // //鍒犻櫎鏂囦欢
+ // File.Delete(ExcelPath);
- //鍒涘缓涓存椂琛�
- DataTable provisional = new DataTable("dt2");
+ // //鍒涘缓涓存椂琛�
+ // DataTable provisional = new DataTable("dt2");
- //娣诲姞鍒楀悕
- for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
- {
- provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
- }
+ // //娣诲姞鍒楀悕
+ // for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ // {
+ // provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ // }
- //娣诲姞鏁版嵁
- for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
- {
- DataRow row = provisional.NewRow();
- for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
- {
- row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
- }
- provisional.Rows.Add(row);
- }
+ // //娣诲姞鏁版嵁
+ // for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ // {
+ // DataRow row = provisional.NewRow();
+ // for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ // {
+ // row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ // }
+ // provisional.Rows.Add(row);
+ // }
- //鍒ゆ柇鍒�
- string error = JudgmentColumns(provisional);
- if (error.Length > 0)
- {
- res.code = "0";
- res.count = 0;
- res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
- res.data = null;
- return res;
- }
+ // //鍒ゆ柇鍒�
+ // string error = JudgmentColumns(provisional);
+ // if (error.Length > 0)
+ // {
+ // res.code = "0";
+ // res.count = 0;
+ // res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ // res.data = null;
+ // return res;
+ // }
- 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 HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐熻矗浜轰唬鐮�"].ToString());
- string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐熻矗浜哄悕绉�"].ToString());
- string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鏉″舰鐮�"].ToString());
- string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
- string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ // 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 HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐熻矗浜轰唬鐮�"].ToString());
+ // string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐熻矗浜哄悕绉�"].ToString());
+ // string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鏉″舰鐮�"].ToString());
+ // string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ // string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
- //鍒ゆ柇璐熻矗浜烘槸鍚﹀瓨鍦�
- if (JudgeEmp(HEmpNumber, HEmpName))
- {
- res.code = CodeConstant.FAIL;
- res.count = CountConstant.FAIL;
- res.Message = "褰撳墠鑱屽憳涓嶅瓨鍦�";
- res.data = null;
- return res;
- }
- //鑾峰彇鐪熷疄琛屾暟
- int line = i + 1;
- }
+ // //鍒ゆ柇璐熻矗浜烘槸鍚﹀瓨鍦�
+ // if (JudgeEmp(HEmpNumber, HEmpName))
+ // {
+ // res.code = CodeConstant.FAIL;
+ // res.count = CountConstant.FAIL;
+ // res.Message = "褰撳墠鑱屽憳涓嶅瓨鍦�";
+ // res.data = null;
+ // return res;
+ // }
+ // //鑾峰彇鐪熷疄琛屾暟
+ // int line = i + 1;
+ // }
- res.code = "1";
- res.count = 1;
- res.Message = error;
- res.data = provisional;
- return res;
- }
- catch (Exception e)
- {
- res.code = "0";
- res.count = 0;
- res.Message = "Exception锛�" + e.ToString();
- res.data = null;
- return res;
- }
- }
+ // res.code = "1";
+ // res.count = 1;
+ // res.Message = error;
+ // res.data = provisional;
+ // return res;
+ // }
+ // catch (Exception e)
+ // {
+ // res.code = "0";
+ // res.count = 0;
+ // res.Message = "Exception锛�" + e.ToString();
+ // res.data = null;
+ // return res;
+ // }
+ //}
/// <summary>
/// 鍒ゆ柇褰撳墠鑱屽憳鏄惁瀛樺湪
@@ -1262,15 +1260,15 @@
/// <param name="HEmpNumber"></param>
/// <param name="HEmpName"></param>
/// <returns></returns>
- private bool JudgeEmp(string HEmpNumber, string HEmpName)
- {
- if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
- {
- DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
- return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
- }
- return false;
- }
+ //private bool JudgeEmp(string HEmpNumber, string HEmpName)
+ //{
+ // if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
+ // {
+ // DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
+ // return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
+ // }
+ // return false;
+ //}
/// <summary>
/// 鍒ゆ柇鍒�
--
Gitblit v1.9.1