From debfb742b27f7a5e668e6cd3f52db2ee8ddfe815 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 13 四月 2026 10:08:35 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/QC_ManagementController.cs | 69 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 58d3d97..a4ea8b0 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -108,6 +108,56 @@
/// <returns></returns>
[Route("QC_Management/MES_QC_CheckProjectList_Json_Main")]
[HttpGet]
+ public object MES_QC_CheckProjectList_Json_Main2(string sWhere, string user, int page = -1, int size = -1)
+ {
+ if(page == -1 || size == -1)
+ {
+ return MES_QC_CheckProjectList_Json_Main(sWhere, user);
+ }
+ DataSet ds;
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn($@"select * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC
+ offset {(page-1)*size} rows fetch next {size} rows only
+ select count(1) [count] from h_v_Gy_QCCheckProjectList_Main
+ ", "h_v_Gy_QCCheckProjectList_Main");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
+ string sql = sql1 + sWhere + $@" order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC offset {(page-1)*size} rows fetch next {size} rows only
+ select count(1) [count] from h_v_Gy_QCCheckProjectList_Main where 1=1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var jsonObj = GetObjectJson(ds) as json;
+ jsonObj.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ return jsonObj;
+ }
+
+
public object MES_QC_CheckProjectList_Json_Main(string sWhere, string user)
{
DataSet ds;
@@ -126,12 +176,12 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC ", "h_v_Gy_QCCheckProjectList_Main");
}
else
{
string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
- string sql = sql1 + sWhere + " order by 鏃ユ湡 desc ";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
}
}
@@ -297,13 +347,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillList where 鍏抽棴浜�='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillMainList where 鍏抽棴浜�='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillMainList");
}
else
{
- string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where 鍏抽棴浜�='' ";
+ string sql1 = "select * from h_v_QC_PatrolProcCheckBillMainList where 鍏抽棴浜�='' ";
string sql = sql1 + sqlWhere+ " order by 鍒跺崟鏃ユ湡 desc ";
- ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
+ ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillMainList");
}
}
catch (Exception e)
@@ -1357,10 +1407,17 @@
if(HInterID=="0")
{
sql = "select top 1 * from Gy_QCCheckProjectMain order by HInterID desc";
+
}
else
sql = "select * from Gy_QCCheckProjectMain where HInterID = " + HInterID;
ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if(ds!=null)
+ {
+ oBill.omodel.HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]);
+ HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]).ToString();
+ }
+
if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
{
objJsonResult.code = "0";
@@ -2125,7 +2182,7 @@
UserName = oItem.HMaker;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HDate=oItem.HDate.ToString()==""? DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
oItem.HBillType = "7506";
oItem.HBillSubType = "7506";
oItem.HBillStatus = 0;
--
Gitblit v1.9.1