MES-WEB-API.git

			@@ -151,7 +151,7 @@

			List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg1);

			long HItemID = list[0].HItemID;
			long HItemID = list[0].HInterID;
			string HNumber = list[0].HNumber;
			string HShortNumber = list[0].HShortNumber;
			string HName = list[0].HName;
			@@ -253,21 +253,22 @@
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();
			string msg5 = sArray[3].ToString();
			string msg2 = sArray[0].ToString(); //表头数据
			string msg3 = sArray[1].ToString(); //列表主ID
			string msg4 = sArray[2].ToString(); //登录人员
			string msg5 = sArray[3].ToString(); //权限模块代码
			//反序列化
			msg2 = "[" + msg2.ToString() + "]";
			List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);

			long HItemID = list[0].HItemID;
			long HItemID = list[0].HInterID;
			string HNumber = list[0].HNumber;
			string HShortNumber = list[0].HShortNumber;
			string HName = list[0].HName;
			long HParentID = list[0].HParentID;
			long HLevel = list[0].HLevel;
			string HEndFlag = list[0].HEnfFlag;
			bool HStopflag = list[0].HStopflag;
			string HHelpCode = list[0].HHelpCode;
			string HShortName = list[0].HShortName;
			string HAddress = list[0].HAddress;
			@@ -330,11 +331,35 @@
			oCN.BeginTran();
			//主表
			oCN.RunProc("Update Gy_Supplier set " +
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HParentID=" + HParentID +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			" HNumber='" + HNumber + "'" +
			",HName='" + HName + "'" +
			",HShortNumber='" + HShortNumber + "'" +
			",HParentID=" + HParentID.ToString() +
			",HLevel=" + HLevel.ToString() +
			",HStopflag=" + HStopflag +
			",HRemark= '" + HRemark + "'" +
			",HHelpCode='" + HHelpCode + "'" +
			",HShortName='" + HShortName + "'" +
			",HAddress='" + HAddress + "'" +
			",HLinkMan='" + HLinkMan + "'" +
			",HLinkPhone='" + HLinkPhone + "'" +
			",HMobilePhone='" + HMobilePhone + "'" +
			",HFax='" + HFax + "'" +
			",HPostalCode='" + HPostalCode + "'" +
			",HEmail='" + HEmail + "'" +
			",HBank='" + HBank + "'" +
			",HBankAccount='" + HBankAccount + "'" +
			",HTaxNum='" + HTaxNum + "'" +
			",HTaxRate=" + HTaxRate.ToString() +
			",HCountry='" + HCountry + "'" +
			",HCorMan='" +HCorMan + "'" +
			",HEnglishName='" + HEnglishName + "'" +
			",HEnglishAddress='" + HEnglishAddress + "'" +
			",HCurID=" + HCurID.ToString() +
			",HSSID=" + HSSID.ToString() +
			",HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);


			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			//将上级为非末级
			@@ -358,6 +383,86 @@
			}
			}

			/// <summary>
			/// 供应商列表删除
			/// </summary>
			/// <param name="HItemID">删除列的ID</param>
			/// <param name="User">当前登录用户</param>
			/// <param name="ModRightNameDelete"></param>
			/// <returns></returns>
			[Route("Gy_Supplier/Delete_Json")]
			[HttpGet]
			public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
			{
			DAL.ClsGy_Supplier_Ctl oGroup = new DAL.ClsGy_Supplier_Ctl();
			DAL.ClsGy_Supplier_View oGroupHlp = new DAL.ClsGy_Supplier_View();
			try
			{
			if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有删除权限";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oGroupHlp.GetInfoByID(HItemID))
			{
			if (oGroup.HavChildCodes(HItemID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此项目存在子项目,不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//删除前判断是否已使用 20141020
			if (oGroupHlp.omodel.HUseFlag != "未使用")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此项目已使用或者未检测，不能删除！请重新检测再删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//
			if (oGroup.DeleteByID(HItemID))
			{
			//写入日志
			ClsPub.Add_Log("", "删除项目，代码：" + oGroupHlp.omodel.HNumber + ",名称：" + oGroupHlp.omodel.HName, ClsPub.CurUserName);
			//更新上级为末级
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//
			}
			}