From ed80467e957a5ae62f2e7a4df1e794a24eb36af3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 21 九月 2022 09:12:16 +0800
Subject: [PATCH] LAYUI列表列名改为动态加载模式（ 器具保养规程单维护，器具寿命调整单维护，器具保养记录单维护，器具点检记录单维护，器具故障登记单维护，器具维修记录单维护，设备点检规程单维护，设备保养规程单维护，设备保养记录单维护，设备点检记录单维护，设备故障登记单维护，设备维修记录单维护，班组职员清单维护 ）
---
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 98 +++++++++++++++++++++++++++---------------------
1 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index d7ff4ba..87ed716 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -25,37 +25,45 @@
#region 鍣ㄥ叿缁翠慨娲惧伐鍗曟煡璇�
[Route("Sc_MouldRepairSendWorkBill/GetMouldRepairSendWorkBillList")]
[HttpGet]
- public object GetMouldRepairSendWorkBillList(string sWhere)
+ public object GetMouldRepairSendWorkBillList(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRepairSendWorkBill ", "h_v_Sc_MouldRepairSendWorkBill");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRepairSendWorkBill order by hmainid desc ", "h_v_Sc_MouldRepairSendWorkBill");
}
else
{
string sql1 = "select * from h_v_Sc_MouldRepairSendWorkBill where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairSendWorkBill");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+ //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 e)
{
@@ -103,8 +111,18 @@
int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string msg4 = sArray[4].ToString();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
omodel = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSb_MouldRepairWorkBillMain>(msg2);
string BillType = "3843";
@@ -225,37 +243,30 @@
#region 鍣ㄥ叿缁翠慨娲惧伐鍗� 鍒犻櫎
[Route("Sc_MouldRepairSendWorkBill/MouldDeleteBill")]
[HttpGet]
- public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
+ public object MouldDeleteBill(long HInterID, string user)
{
try
{
//鍒ゆ柇鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
-
- if (oBill.omodel.HBillStatus > 1)
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
objJsonResult.data = null;
return objJsonResult;
}
+ oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+
if (oBill.omodel.HChecker != "")
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
+
if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "1";
@@ -289,19 +300,19 @@
[HttpGet]
public object CheckDeOAuditBill(int HInterID, int IsAudit, string CurUserName)
{
- // string ModRightNameCheck = ""; 璇ユā鍧楃殑瀹℃牳鍔熻兘
+
DBUtility.ClsPub.CurUserName = CurUserName; //瀛樺偍鐢ㄦ埛鍚�
try
{
//鍒ゆ柇鏄惁鏈夊鏍告潈闄�
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍒ゆ柇id 鏄惁澶т簬0
if (HInterID <= 0)
@@ -313,6 +324,7 @@
return objJsonResult;
}
+
//杞崲id
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
--
Gitblit v1.9.1