MES-WEB-API.git

			@@ -8,6 +8,8 @@
			using System.Data.SqlClient;
			using System.Web.Http;
			using WebAPI.Models;
			using System.Text.RegularExpressions;
			using SyntacticSugar.constant;
			namespace WebAPI.Controllers
			{
			public class Gy_SupplierController : ApiController
			@@ -78,7 +80,61 @@
			}
			}

			#region 供应商分页列表
			[Route("Gy_Supplier/page")]
			[HttpGet]
			public json Gy_SupplierPage(string sWhere, string user, int page, int size, string Organization)
			{
			DataSet ds;
			json res = new json();
			try
			{
			List<object> columnNameList = new List<object>();
			//判断权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			sWhere += ("and 组织名称 = '" + Organization + "'");
			sWhere = sWhere.Replace("'", "''");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_Gy_SupplierList " + page + "," + size + ",''", "h_p_Gy_SupplierList");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_Gy_SupplierList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_SupplierList");
			}

			//添加列名
			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列对象的列名
			}

			res.code = CodeConstant.SUCCEED;
			res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			res.Message = "Sucess！";
			res.list = columnNameList;
			res.data = ds.Tables[0];
			return res;
			}
			catch (Exception e)
			{
			res.code = CodeConstant.FAIL;
			res.count = CountConstant.FAIL;
			res.Message = "Exception！" + e.ToString();
			res.data = null;
			return res;
			}
			}
			#endregion


			/// <summary>
			@@ -110,6 +166,83 @@
			}
			}

			#region 客户根据分类获取最大客户编码
			[Route("Gy_Supplier/getMaxNum")]
			[HttpGet]
			public object getMaxNum(int HSupTypeID, string user, string Organization)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HSupTypeID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有选择具体分类！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			ds = oCN.RunProcReturn(@"select * from h_v_Gy_SupplierList where 组织名称='" + Organization + "'" + "and HSupTypeID = '" + HSupTypeID + "'" + " order by 供应商代码 desc", "h_v_Gy_SupplierList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "没有找到该分类的客户编码请使用普通新增";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string HNumber = ds.Tables[0].Rows[0]["供应商代码"].ToString();
			// 使用正则表达式找到数字部分 (?<=\D)是一个零宽断言，表示前面的字符不是数字 (\d+)$表示后面跟着一连串字符串知道末尾
			Match match = Regex.Match(HNumber, @"(?<=\D)(\d+)$");
			if (match.Success)
			{
			string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // 提取前缀
			int number = int.Parse(match.Value); // 解析数字
			// 数字+1
			number++;
			// 格式化数字，保持原长度
			string formattedNumber = number.ToString().PadLeft(match.Length, '0');
			// 重新组合字符串
			string result = prefix + formattedNumber;

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "success";
			objJsonResult.data = result;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			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;
			}
			}
			#endregion

			/// <summary>
			/// 供应商列表修改按钮方法
			///参数：string sql。
			@@ -121,19 +254,8 @@
			{
			try
			{
			string sql = string.Format(@"select s.HItemID,s.HUSEORGID,o.Hname 使用组织,s.HCREATEORGID ,d.Hname 创建组织,s.HNumber 编码,s.HName 名称,s.HHelpCode 助记码,s.HShortName 简称,s.HAddress 地址,s.HLinkMan 联系人,s.HLinkPhone 联系电话
			,s.HMobilePhone 手机,s.HFax 传真,s.HPostalCode 邮编,s.HEmail 电子邮件,s.HCorMan 法人代表,s.HBank 开户银行,s.HBankAccount 银行账号,s.HPSStyleID 采购方式ID,f.HName 采购方式名称,
			s.HTaxNum 税务登记号,s.HEnglishName 英文名称,s.HEngLishAddress 英文地址,s.HCountry 国家,s.HStopflag 禁用标志
			,s.HRemark 备注,s.HAreaID 地区ID,a.HName 地区名称,s.HTaxRate 增值税率,s.HCurID 默认货币ID,r.HName 默认货币,
			s.HSSID 结算方式ID,e.HName 结算方式,s.HMaterClass 供货材料类别 from Gy_Supplier s
			left join Gy_AreaSet a on s.HAreaID=a.HItemID
			left join Gy_Currency r on s.HCurID=r.HItemID
			left join Gy_SettleStyle e on s.HSSID=e.HItemID
			left join Xt_ORGANIZATIONS o on s.HUSEORGID=o.HItemID
			left join Xt_ORGANIZATIONS d on s.HCREATEORGID=d.HItemID
			left join Gy_PoStockStyle f on s.HPSStyleID=f.HItemID
			where s.HItemID='" + HInterID + "'");
			ds = oCN.RunProcReturn(sql, "Gy_Supplier");
			string sql = string.Format(@"select * from h_v_Gy_SupplierEdit where HItemID='" + HInterID + "'");
			ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierEdit");
			DataSet cs = oCN.RunProcReturn("select * from Gy_Supplier_PayPlan where HSupID = '"+ HInterID + "'", "Gy_Supplier_PayPlan");
			List<Object> list = new List<object>();
			list.Add(cs);
			@@ -215,6 +337,7 @@
			string HRemark = list[0].HRemark;
			string HMaterClass = list[0].HMaterClass;
			long HPSStyleID = list[0].HPSStyleID;
			long HSupTypeID = list[0].HSupTypeID;

			if (!DBUtility.ClsPub.AllowNumber(HNumber))
			{
			@@ -233,13 +356,13 @@
			",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
			",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
			",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
			",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HUSEORGID,HCREATEORGID,HPSStyleID) " +
			",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HUSEORGID,HCREATEORGID,HPSStyleID,HSupTypeID) " +
			" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
			"," + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
			",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
			",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
			",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
			",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + " ','" + HUseOrgID + "' ,'" + HCreateOrgID + "' ,'" + HPSStyleID +
			",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + " ','" + HUseOrgID + "' ,'" + HCreateOrgID + "' ,'" + HPSStyleID+ "' ,'" + HSupTypeID +
			"') ");
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -336,6 +459,7 @@
			///参数：string sql。
			///返回值：object。
			/// </summary>

			[Route("Gy_Supplier/AddBill1")]
			[HttpPost]
			public object AddBill1([FromBody] JObject oMain)
			@@ -394,6 +518,7 @@
			string HRemark = list[0].HRemark;
			string HMaterClass = list[0].HMaterClass;
			long HPSStyleID = list[0].HPSStyleID;
			long HSupTypeID = list[0].HSupTypeID;

			//判断权限
			if (!ClsPub.Security_Log(msg6, 1, false, msg5))
			@@ -447,6 +572,7 @@
			",HSSID=" + HSSID.ToString() +
			",HMaterClass='" + HMaterClass +
			"',HPSStyleID='"+ HPSStyleID.ToString() +
			"',HSupTypeID='" + HSupTypeID.ToString() +
			"',HUSEORGID='" + HUseOrgID.ToString() +
			"',HCREATEORGID='" + HCreateOrgID.ToString() +
			"',HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);