From 03c09ccd53569d8acdc3917706ca81e9ae46dbbf Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 05 三月 2025 14:53:25 +0800
Subject: [PATCH] 销售价格资料
---
WebAPI/Controllers/WebAPIController.cs | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 0674f47..98bd60c 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -37,7 +37,7 @@
string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
/// <summary>
- /// 閫佽揣鍗曡〃澶翠俊鎭�
+ /// 鑾峰彇鍗曟嵁鍙蜂笌鍗曟嵁鍐呯爜
/// </summary>
/// <param name="sMsg"></param>
/// <returns></returns>
@@ -352,6 +352,16 @@
objjson.code = "0";
objjson.count = 0;
objjson.Message = "瀵嗙爜閿欒锛�";
+ objjson.data = null;
+ return objjson;
+ }
+ //鍒ゆ柇鐢ㄦ埛鏁版槸鍚﹀ぇ浜庡鎴疯处鍙锋暟
+ DataSet ds1 = oCN.RunProcReturn("Exec h_p_Xt_BaseInfo ", "h_p_Xt_BaseInfo");
+ if (DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = ds1.Tables[0].Rows[0]["HBackRemark"].ToString();
objjson.data = null;
return objjson;
}
@@ -16856,12 +16866,16 @@
/// <returns></returns>
[Route("Web/GetCheckItemID")]
[HttpGet]
- public object GetCheckItemID(string HName,string HProName)
+ public object GetCheckItemID(string HName,string HProName,string HSourceID)
{
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='"+HName+ "' and 宸ュ簭鍚嶇О='" + HProName + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='"+HName+ "' and 宸ュ簭鍚嶇О='" + HProName + "' and HSourceID='" + HSourceID + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='" + HName + "' and 宸ュ簭鍚嶇О='" + HProName + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ }
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -17996,6 +18010,7 @@
public int HLevel { get; set; }
public string Hurl { get; set; }
public string HPicNum { get; set; }
+ public string HShowMode { get; set; }
public List<MenuLoad> childMenus { get; set; }
}
@@ -18007,18 +18022,18 @@
{
List<MenuLoad> mu = new List<MenuLoad>(); //浠ョ埗瀛愮骇缁撴瀯瀛樻斁鑿滃崟娓呭崟淇℃伅
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //鏁版嵁搴撴搷浣滃伐鍏�
- string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
+ string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition";
ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁
if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅
{
- string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum from Gy_MenuDefineSet where HMakeName=" +
+ string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode from Gy_MenuDefineSet where HMakeName=" +
"(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " +
"left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='"+HMakeName+"' order by len(c.GroupName ))";
ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //鏌ヨ鐢ㄦ埛缁戝畾鐨勮鑹� 鏄惁璁剧疆鑿滃崟淇℃伅 鍙栬鑹插悕绉版渶鐭殑涓�涓�
if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
{
sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
- ds = oCn.RunProcReturn(sql, "Gy_Menu");
+ ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
}
}
@@ -18033,6 +18048,7 @@
tbj.HPartentID = ds.Tables[0].Rows[i]["HPartentID"].ToString();
tbj.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString());
tbj.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString();
+ tbj.HShowMode = ds.Tables[0].Rows[i]["HShowMode"].ToString();
if (ds.Tables[0].Rows[i]["HPicNum"] != null)
{
tbj.HPicNum = ds.Tables[0].Rows[i]["HPicNum"].ToString();
@@ -18075,6 +18091,7 @@
tbjson.HName = dt.Rows[i]["HName"].ToString();
tbjson.HLevel = tree[m].HLevel;
tbjson.Hurl = dt.Rows[i]["Hurl"].ToString();
+ tbjson.HShowMode = dt.Rows[i]["HShowMode"].ToString();
if (dt.Rows[i]["HPicNum"] != null)
{
tbjson.HPicNum = dt.Rows[i]["HPicNum"].ToString();
--
Gitblit v1.9.1