MES-WEB-API.git

			@@ -10,6 +10,7 @@
			using System.Web;
			using System.Web.Http;
			using WebAPI.Models;
			using WebAPI.Models.基础资料;
			using WebAPI.Service;

			namespace WebAPI.Controllers
			@@ -49,11 +50,11 @@
			string sql1 = string.Format(@"select * from h_v_IF_EmployeeList where 组织名称='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 职员代码", "h_v_IF_EmployeeList");
			ds = oCN.RunProcReturn(sql1 + sWhere, "h_v_IF_EmployeeList");
			}
			else
			{
			string sql = sql1 + sWhere + " order by 职员代码";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
			}

			@@ -288,6 +289,7 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();
			//string msg4 = sArray[2].ToString();
			//string msg5 = sArray[3].ToString();

			@@ -304,6 +306,7 @@
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg2);
			List<ClsGy_EmployeeSub> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_EmployeeSub>>(msg4);

			long HItemID = list[0].HItemID;
			string HNumber = list[0].HNumber;
			@@ -428,6 +431,17 @@
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//查询数据中是否存在重复代码
			ds = oCN.RunProcReturn("Select HItemID from Gy_Employee 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)
			@@ -450,7 +464,7 @@
			",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
			",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
			",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
			",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress" +
			",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress,HMakeEmp" +
			") " +
			" Values('" + HNumber + "','" + HName + "','" + HShortNumber + "','" + HEmpRate.ToString() + "','" + HExamRate.ToString() +
			"','" + HLevel + "','" + HParentID + "','" + Convert.ToString(HEndFlag ? 1 : 0) + "','" + HHighestPay.ToString() + "','" + HOverPayRate.ToString() +
			@@ -468,15 +482,52 @@
			"','" + HEmpType + "'" + ",'" + HPayType + "'" + ",'" + DBUtility.ClsPub.BoolToString(HOverType) + "','" + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "','" + DBUtility.ClsPub.BoolToString(HShiftFlag) + "','" + DBUtility.ClsPub.BoolToString(HStopwagesFlag) +
			"','" + HPostalCode + "','" + HBank + "','" + HBasePay.ToString() + "','" + HExamLevPostMoney.ToString() + "','" + HBSTDeptID + "'" +
			",'" + HOtherDeduct3.ToString() + "','" + HInsurance.ToString() + "','" + HMedicare.ToString() + "','" + HDrydock.ToString() +
			"','" + HBankAccount + "'" + ",'" + HGroupID.ToString() + "','" + HDeptID.ToString() + "','" + HWorkTypeID.ToString() + "','" + HCTPrjID.ToString() + "','" + HUSEORGID + "','" + HAddress + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			"','" + HBankAccount + "'" + ",'" + HGroupID.ToString() + "','" + HDeptID.ToString() + "','" + HWorkTypeID.ToString() + "','" + HCTPrjID.ToString() + "','" + HUSEORGID + "','" + HAddress + "','"+ msg3 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

			DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_Employee where HNumber = N'" + HNumber + "'", "Gy_Employee");

			if (temp_ds.Tables[0].Rows.Count < 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存失败!原因：插入数据失败";
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}

			int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
			string sql3 = "";
			foreach (ClsGy_EmployeeSub listOne in list1)
			{
			sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
			+ itemID + "," + listOne.HPostID +",N'" + listOne.HRemark + "');";

			}
			LogService.Write(sql3);
			oCN.RunProcReturn(sql3, "Gy_Employee_Post");
			oCN.Commit();
			}
			else
			{

			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//已审核不允许修改
			DataSet dss;
			dss = oCN.RunProcReturn("select * from Gy_Employee where HItemID=" + HItemID, "Gy_Employee");
			//判断是否可编辑
			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_Employee set " +
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			@@ -562,6 +613,17 @@

			",HAddress='" + HAddress.ToString() + "'" +
			",HDeptID= '" + HDeptID + "' Where HItemID=" + HItemID);

			oCN.RunProcReturn("delete from Gy_Employee_Post where HEmpID = " + HItemID, "Gy_Employee_Post");

			string sql3 = "";
			foreach (ClsGy_EmployeeSub listOne in list1)
			{
			sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
			+ HItemID + "," + listOne.HPostID + ",N'" + listOne.HRemark + "');";
			}
			LogService.Write(sql3);
			oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
			oCN.Commit();
			}
			objJsonResult.code = "0";
			@@ -815,7 +877,52 @@
			// }
			//}

			/// <summary>
			/// 查询子表方法
			/// </summary>
			[Route("Gy_Employee/listSub")]
			[HttpGet]
			public object listSub(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_Employee_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from h_v_IF_EmployeeSubList where 1 = 1 " + sWhere + " order by HItemID ", "h_v_IF_EmployeeSubList");

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 职员设置获取信息