From e69dfa27e62cf31380576ae275a812ece2cf20f9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 30 十二月 2022 10:36:35 +0800
Subject: [PATCH] 器具管理维护
---
WebAPI/Controllers/基础资料/基础资料/Gy_ConkReasonBillController.cs | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonBillController.cs"
index 442ac6e..d739f22 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonBillController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -22,27 +23,48 @@
#region 鏁呴殰鍘熷洜鍒楄〃
[Route("Gy_ConkReasonBill/Get_ConkReasonBillList")]
[HttpGet]
- public object Get_ConkReasonBillList(string sWhere)
+ public object Get_ConkReasonBillList(string sWhere,string user)
{
try
{
- ds = Sc_GetConkReasonBill(sWhere);
- if (ds == null)
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_ConkReason", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
- else
+
+ ds = Sc_GetConkReasonBill(sWhere);
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception ex)
{
@@ -56,14 +78,14 @@
public static DataSet Sc_GetConkReasonBill(string sWhere)
{
- string sql1 = string.Format(@"select * from h_v_Gy_ConkReasonList");
+ string sql1 = string.Format(@"select * from h_v_Gy_ConkReasonList where 1 = 1");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_ConkReasonList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by 鏁呴殰鍘熷洜浠ｇ爜 ", "h_v_Gy_ConkReasonList");
}
else
{
- string sql = sql1 + sWhere + "order by hitemid desc";
+ string sql = sql1 + sWhere + "order by 鏁呴殰鍘熷洜浠ｇ爜 ";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_ConkReasonList");
}
}
@@ -72,8 +94,18 @@
#region [鏁呴殰鍘熷洜鍒犻櫎鍔熻兘]
[Route("Gy_ConkReasonBill/set_DeleteBill")]
[HttpGet]
- public object set_DeleteBill(string HItemID)
+ public object set_DeleteBill(string HItemID,string user)
{
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_ConkReason_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HItemID);
if (lngBillKey == 0)
@@ -158,6 +190,15 @@
ListModels oListModels = new ListModels();
try
{
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_ConkReason_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Model.ClsGy_ConkReason_Model oBill = new Model.ClsGy_ConkReason_Model();
List<Model.ClsGy_ConkReason_Model> lsmain = new List<Model.ClsGy_ConkReason_Model>();
msg1 = msg1.Replace("\\", "");
--
Gitblit v1.9.1