From 74f3a827b455592df58dccf2ab67e76f722df7c1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 09 八月 2022 16:06:56 +0800
Subject: [PATCH] 报工平台维护
---
WebAPI/Controllers/Kf_ICStockBillMainController.cs | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/WebAPI/Controllers/Kf_ICStockBillMainController.cs b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
index 3ef75d4..c1d9d6b 100644
--- a/WebAPI/Controllers/Kf_ICStockBillMainController.cs
+++ b/WebAPI/Controllers/Kf_ICStockBillMainController.cs
@@ -20,35 +20,46 @@
#region 閿�鍞��璐у崟鏌ヨ
[Route("Kf_ICStockBillMain/GetCStockBillList")]
[HttpGet]
- public object GetCStockBillList(string sWhere)
+ public object GetCStockBillList(string sWhere,string user)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1", "h_v_IF_Kf_ICStockBillMain");
- }
- else
- {
- string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_ICStockBill_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
objJsonResult.data = null;
return objJsonResult;
}
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1 order by hmainid desc", "h_v_IF_Kf_ICStockBillMain");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain");
}
+
+ //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)
{
@@ -66,18 +77,20 @@
[HttpGet]
public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
{
- //IsAudit=1 瀹℃牳锛� IsAudit=2 鍙嶅鏍�
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
try
{
+ //IsAudit=1 瀹℃牳锛� IsAudit=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_ICStockBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
--
Gitblit v1.9.1