SRM-WEBAPI.git - Gitblit

parent: fa39675a | 补丁 | 提交 | show whitespace

yusijie

2025-04-03 655dcd6abee52e038e59cd557c3237073c90f979

登录方法查询修改；各列表查询修改供应商过滤方式

7个文件已修改

	WebAPI/Controllers/BarCodeController.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/EntrustOrderController.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/PODemandPlanController.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/POInStockBackController.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/POInStockController.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/POOrderController.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/WebAPIController.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/BarCodeController.cs

@@ -1452,7 +1452,7 @@
        [HttpPost]
        public object GetBarCodeShowList([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            //添加列名
            List<object> columnNameList = new List<object>();           
            try
@@ -1461,7 +1461,7 @@
                string PcWhere = "";
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=''" + HSupNo.Trim() + "'') " + sqlWhere;
                string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;

                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
@@ -1472,7 +1472,7 @@
                    return objjson;
                }
                //获取总行数
                Int64 RowTotal = Common.GetRowTotal("h_v_SRM_BarCodeBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                //Int64 RowTotal = Common.GetRowTotal("h_v_SRM_BarCodeBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                //获取返回数据
                ds = oCn.RunProcReturn("exec h_p_SRM_BarCodeBillList '" + PcWhere + "'", "h_v_SRM_BarCodeBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)

 WebAPI/Controllers/EntrustOrderController.cs

@@ -31,14 +31,14 @@
        [HttpPost]
        public object GetEntrustOrderBill([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    objjson.code = "0";

 WebAPI/Controllers/PODemandPlanController.cs

@@ -31,7 +31,7 @@
        //采购订单列表
        public object GetPODemandPlanBill([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                string VsWhere = "";
@@ -39,7 +39,7 @@
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
               string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
               string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
               
                //转换特殊字符
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)

 WebAPI/Controllers/POInStockBackController.cs

@@ -31,7 +31,7 @@
        [HttpPost]
        public object GetPOInStockBackBillList([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                string VsWhere = "";
@@ -39,7 +39,7 @@
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=''" + HSupNo.Trim() + "'') " + sqlWhere;
                string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
                //转换特殊字符
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {

 WebAPI/Controllers/POInStockController.cs

@@ -512,7 +512,7 @@
        //送货单列表
        public object GetPOInStockBill([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                Stopwatch sw = new Stopwatch();
@@ -522,7 +522,7 @@
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                //其他过滤
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
                //转换特殊字符
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
@@ -533,7 +533,7 @@
                    return objjson;
                }
                //获取总行数
                Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POInStockBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                //Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POInStockBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                //获取返回数据
                ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBillList '" + PcWhere + "'", "H_p_SRM_POInStockBillList");


 WebAPI/Controllers/POOrderController.cs

@@ -33,7 +33,7 @@
        //采购订单列表
        public object GetPOOrderBill([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            //string msg = "";
            try
            {
@@ -41,7 +41,7 @@
                string PcWhere = "";
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
                //转换特殊字符
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {

 WebAPI/Controllers/WebAPIController.cs

@@ -209,7 +209,7 @@
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "登录成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.data = ds;
                    Add_Log("主界面", UserName, "登录");
                    return objJsonResult;
                }
@@ -230,7 +230,8 @@
            try
            {
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DS = oCn.RunProcReturn("select * from Gy_Czygl where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");
                //DS = oCn.RunProcReturn("select * from Gy_Czygl where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");
                DS = oCn.RunProcReturn("exec h_p_SRM_GetSupIDByUser '" + MainID + "','" + sPsd + "'", "h_p_SRM_GetSupIDByUser");
                if (DS.Tables[0].Rows.Count == 0)
                    return null;
                else

			@@ -1452,7 +1452,7 @@
			[HttpPost]
			public object GetBarCodeShowList([FromBody] JObject msg)
			{
			string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			//添加列名
			List<object> columnNameList = new List<object>();
			try
			@@ -1461,7 +1461,7 @@
			string PcWhere = "";
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds;
			string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=''" + HSupNo.Trim() + "'') " + sqlWhere;
			string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;

			if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
			{
			@@ -1472,7 +1472,7 @@
			return objjson;
			}
			//获取总行数
			Int64 RowTotal = Common.GetRowTotal("h_v_SRM_BarCodeBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
			//Int64 RowTotal = Common.GetRowTotal("h_v_SRM_BarCodeBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
			//获取返回数据
			ds = oCn.RunProcReturn("exec h_p_SRM_BarCodeBillList '" + PcWhere + "'", "h_v_SRM_BarCodeBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)

			@@ -31,14 +31,14 @@
			[HttpPost]
			public object GetEntrustOrderBill([FromBody] JObject msg)
			{
			string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			try
			{
			string VsWhere = "";
			string PcWhere = "";
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds;
			string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
			string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
			if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
			{
			objjson.code = "0";

			@@ -31,7 +31,7 @@
			//采购订单列表
			public object GetPODemandPlanBill([FromBody] JObject msg)
			{
			string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			try
			{
			string VsWhere = "";
			@@ -39,7 +39,7 @@
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds;
			//其他过滤
			string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
			string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;

			//转换特殊字符
			if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)

			@@ -31,7 +31,7 @@
			[HttpPost]
			public object GetPOInStockBackBillList([FromBody] JObject msg)
			{
			string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			try
			{
			string VsWhere = "";
			@@ -39,7 +39,7 @@
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds;
			//其他过滤
			string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=''" + HSupNo.Trim() + "'') " + sqlWhere;
			string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
			//转换特殊字符
			if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
			{

			@@ -512,7 +512,7 @@
			//送货单列表
			public object GetPOInStockBill([FromBody] JObject msg)
			{
			string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			try
			{
			Stopwatch sw = new Stopwatch();
			@@ -522,7 +522,7 @@
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds;
			//其他过滤
			string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
			string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
			//转换特殊字符
			if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
			{
			@@ -533,7 +533,7 @@
			return objjson;
			}
			//获取总行数
			Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POInStockBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
			//Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POInStockBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
			//获取返回数据
			ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBillList '" + PcWhere + "'", "H_p_SRM_POInStockBillList");

			@@ -33,7 +33,7 @@
			//采购订单列表
			public object GetPOOrderBill([FromBody] JObject msg)
			{
			string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
			//string msg = "";
			try
			{
			@@ -41,7 +41,7 @@
			string PcWhere = "";
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds;
			string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
			string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
			//转换特殊字符
			if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
			{

			@@ -209,7 +209,7 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "登录成功！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.data = ds;
			Add_Log("主界面", UserName, "登录");
			return objJsonResult;
			}
			@@ -230,7 +230,8 @@
			try
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DS = oCn.RunProcReturn("select * from Gy_Czygl where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");
			//DS = oCn.RunProcReturn("select * from Gy_Czygl where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");
			DS = oCn.RunProcReturn("exec h_p_SRM_GetSupIDByUser '" + MainID + "','" + sPsd + "'", "h_p_SRM_GetSupIDByUser");
			if (DS.Tables[0].Rows.Count == 0)
			return null;
			else