From a893f52b8bb2317a563805c1d6f31cafad5653d7 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 08 九月 2022 18:08:43 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 46 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index f09c549..302afc7 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -20,42 +20,46 @@
/// <returns></returns>
[Route("Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList")]
[HttpGet]
- public object GetEquipMaintainPlanBillList(string sWhere)
+ public object GetEquipMaintainPlanBillList(string sWhere,string user)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintain " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintain");
- }
- else
- {
- string sql1 = "select * from h_v_Sc_EquipMaintain where 1 = 1";
- string sql = sql1 + sWhere + " order by hmainid desc";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintain");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁浣犺鎵剧殑璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintainPlan " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintainPlan");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql1 = "select * from h_v_Sc_EquipMaintainPlan where 1 = 1";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
}
- //ds = Sb_EquipMaintainPlanBillList_s(sWhere);
- //objJsonResult.code = "1";
- //objJsonResult.count = 1;
- //objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- //objJsonResult.data = ds.Tables[0];
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
//return objJsonResult;
+ //}
}
catch (Exception ex)
{
@@ -92,11 +96,20 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBill_Edit", 1, false, msg5))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DAL.ClsSb_EquipMaintainPlanBill oBill = new DAL.ClsSb_EquipMaintainPlanBill();
List<Model.ClsSb_EquipMaintainPlanBillMain> lsmain = new List<Model.ClsSb_EquipMaintainPlanBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -166,7 +179,7 @@
msg4 = msg4.Substring(1, msg4.Length - 2);
msg4 = msg4.Replace("\\", "");
msg4 = msg4.Replace("\n", ""); //\n
- //msg2 = msg2.Replace("'", "鈥�");
+ //msg2 = msg2.Replace("'", "鈥�");
List<Model.ClsSb_EquipMaintainPlanBillSub> ls1 = new List<Model.ClsSb_EquipMaintainPlanBillSub>();
ls1 = oListModels.getObjectByJson_Sb_EquipMaintainPlanBillSub(msg4);
int j = 0;
@@ -178,11 +191,11 @@
//oItemSub.HCloseMan = ""; //琛屽叧闂�
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- //oItemSub.HRemark = ""; //澶囨敞
+ //oItemSub.HRemark = ""; //澶囨敞
oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
//HMaterID = "";//閰嶄欢浠ｇ爜
@@ -236,24 +249,21 @@
#endregion
#region [璁惧淇濆吇璁″垝琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// 璁惧淇濆吇璁″垝琛ㄥ垹闄ゅ姛鑳�
/// </summary>
/// <returns></returns>
[Route("Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList")]
[HttpGet]
- public object DeltetEquipMaintainPlanBillList(string HInterID)
+ public object DeltetEquipMaintainPlanBillList(string HInterID,string user)
{
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
@@ -327,7 +337,7 @@
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
#endregion
- #region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
+ #region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetai")]
[HttpGet]
public object Sb_EquipMaintainPlanBillListProjectDetai(string sqlWhere)
@@ -367,9 +377,9 @@
#endregion
#region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁鏂�(淇濆吇椤瑰垪琛ㄣ�侀厤浠堕」鍒楄〃)]
- [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainBillListProjectDetaiNew")]
+ [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew")]
[HttpGet]
- public object Sb_EquipMaintainBillListProjectDetaiNew(string HInterID)
+ public object Sb_EquipMaintainPlanBillListProjectDetaiNew(string HInterID)
{
DataSet ds, ds1;
@@ -387,11 +397,12 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
- string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainBillSub_Item where 1 = 1 " + Swhere + "";
- ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillSub_Item");
+ string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainPlanBillSub_Item where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainPlanBillSub_Item");
//鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
- string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 " + Swhere + "";
+ string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 " + Swhere + "";
ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList");
+
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
objJsonResult.code = "0";
--
Gitblit v1.9.1