From 3e073e3d25f894fa43b800b6ee3c44a847203ddf Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期五, 16 一月 2026 15:33:07 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/WebAPIController.cs | 129 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 127 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 34d9c10..8285d75 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -20070,7 +20070,7 @@
List<object> columnNameList = new List<object>();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = "Select * from h_v_Gy_GetSampleSchemeListView where 1 = 1 " + sWhere + "Order by hmainid ";
+ string sql = "Select * from h_v_Gy_GetSampleSchemeListView where 1 = 1 and HUSEORGID = "+OrganizationID + sWhere + "Order by hmainid ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_GetSampleSchemeListView");
//娣诲姞鍒楀悕
@@ -20287,6 +20287,54 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = "exec h_p_Gy_GetQCCheckItemByProject " + CheckProjectID + "," + HBatchQty + "," + HMaterID + ",'" + HBillType + "'";
ds = oCN.RunProcReturn(sql, "h_p_Gy_GetQCCheckItemByProject");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁妫�楠屾柟妗堜富鍐呯爜鑾峰彇妫�楠岄」鐩�,鍓嶉潰鐨勪細鎶婂厛鑾峰彇鐗╂枡鐨勯粯璁よ川妫�鏂规锛孉PP鍙牴鎹楠屾柟妗圛D鑾峰彇瀵瑰簲妫�楠岄」鐩�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetCheckItemByCheckProjectID_Sec")]
+ [HttpGet]
+ public object GetCheckItemByCheckProjectID_Sec(int CheckProjectID, int HBatchQty, int HMaterID, string HBillType)
+ {
+ //if (CheckProjectID <= 0)
+ //{
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "妫�楠屾柟妗堟湭閫夋嫨";
+ // objjson.data = null;
+ // return objjson;
+ //}
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "exec h_p_Gy_GetQCCheckItemByProject_Sec " + CheckProjectID + "," + HBatchQty + "," + HMaterID + ",'" + HBillType + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Gy_GetQCCheckItemByProject_Sec");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -20882,6 +20930,80 @@
}
}
+ #region
+ [Route("Web/GetMouldBillsList")]
+ [HttpGet]
+ public object GetMouldBillsList(string sWhere, string Type, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ string HView = "";
+ switch (Type)
+ {
+ case "RC": // 妯″叿缁翠慨妫�楠屽崟
+ HView = "h_v_Sc_MouldRepairCheckBillList";
+ break;
+ case "PG": // 妯″叿缁翠慨娲惧伐鍗�
+ HView = "h_v_Sc_MouldRepairSendWorkBill";
+ break;
+ default:
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁惧妯″潡绫诲瀷閿欒锛�";
+ objjson.data = null;
+ return objjson;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
+ if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠＄悊鍛�
+ {
+ //涓嶆槸绠＄悊鍛�
+ sWhere += " and 鍒跺崟浜� = '" + user + "'";
+ }
+
+
+ string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc, hmainid desc");
+ ds = oCN.RunProcReturn(sql, HView);
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇澶辫触,鏌ユ棤鏁版嵁";
+ objjson.data = null;
+ objjson.list = columnNameList;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ objjson.list = columnNameList;
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ #endregion
+
/// <summary>
/// 鏌ヨ鍚勭被璁惧鍗曟嵁鍒楄〃锛堣澶囩偣妫�锛岃澶囩淮淇紝璁惧淇濆吇......锛�
/// </summary>
@@ -20917,6 +21039,9 @@
case "XJ":
HView = "h_v_Sb_EquipPatrolCheckBillList";
break;
+ case "PG": // 璁惧缁翠慨娲惧伐鍗�
+ HView = "h_v_Sb_EquipRepairSendWorkBillList";
+ break;
default:
objjson.code = "0";
objjson.count = 0;
@@ -20935,7 +21060,7 @@
}
- string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere);
+ string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc, hmainid desc");
ds = oCN.RunProcReturn(sql, HView);
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1