From 5a517fbdc48beb4eb8291ec18452e11fcbf9da7a Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 07 三月 2024 11:42:16 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/WebAPIController.cs | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 3cb072b..b23cf09 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -8109,14 +8109,34 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
+
ds = oCN.RunProcReturn("select * from Gy_ProjectMoney where HItemID=" + HItemID, "Gy_ProjectMoney");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
@@ -8951,11 +8971,11 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 Order by HInterID ", "Gy_EquipFileBillMain");
+ ds = oCN.RunProcReturn("Select HInterID,HEquipFileNumber,HName,HModel2 from Gy_EquipFileBillMain where 0=0 Order by HInterID ", "Gy_EquipFileBillMain");
}
else
{
- string sql1 = "Select HInterID,HEquipFileNumber,HName from Gy_EquipFileBillMain where 0=0 ";
+ string sql1 = "Select HInterID,HEquipFileNumber,HName,HModel2 from Gy_EquipFileBillMain where 0=0 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "Gy_EquipFileBillMain");
}
@@ -9984,7 +10004,7 @@
/// <returns></returns>
[Route("Web/GetItemByEquipFile")]
[HttpGet]
- public object GetItemByEquipFile(int EquipProjectID,string Type)
+ public object GetItemByEquipFile(int EquipProjectID,string Type,string HDate)
{
if (EquipProjectID <= 0)
{
@@ -10014,7 +10034,8 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
+ //string sql = string.Format(@"select * from " + HView + " where HInterID = " + EquipProjectID);
+ string sql = string.Format(@"Exec h_p_Sb_GetCheckItem_PDA '" + EquipProjectID + "','" + Type + "','" + HDate + "'");
ds = oCN.RunProcReturn(sql, HView);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -10049,7 +10070,7 @@
/// <returns></returns>
[Route("Web/GetEquipmentBillsList")]
[HttpGet]
- public object GetEquipmentBillsList(string sWhere, string Type)
+ public object GetEquipmentBillsList(string sWhere, string Type,string user)
{
try
{
@@ -10081,6 +10102,15 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
+ if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠＄悊鍛�
+ {
+ //涓嶆槸绠＄悊鍛�
+ sWhere += " and 鍒跺崟浜� = '" + user + "'";
+ }
+
+
string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere);
ds = oCN.RunProcReturn(sql, HView);
//娣诲姞鍒楀悕
--
Gitblit v1.9.1