From e4140df6e83de6fdabc57650d27183bcf5a312b1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 17 二月 2025 17:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index a826123..b7de8fe 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -37,7 +37,7 @@
string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
/// <summary>
- /// 閫佽揣鍗曡〃澶翠俊鎭�
+ /// 鑾峰彇鍗曟嵁鍙蜂笌鍗曟嵁鍐呯爜
/// </summary>
/// <param name="sMsg"></param>
/// <returns></returns>
@@ -352,6 +352,16 @@
objjson.code = "0";
objjson.count = 0;
objjson.Message = "瀵嗙爜閿欒锛�";
+ objjson.data = null;
+ return objjson;
+ }
+ //鍒ゆ柇鐢ㄦ埛鏁版槸鍚﹀ぇ浜庡鎴疯处鍙锋暟
+ DataSet ds1 = oCN.RunProcReturn("Exec h_p_Xt_BaseInfo ", "h_p_Xt_BaseInfo");
+ if (DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = ds1.Tables[0].Rows[0]["HBackRemark"].ToString();
objjson.data = null;
return objjson;
}
@@ -16856,12 +16866,12 @@
/// <returns></returns>
[Route("Web/GetCheckItemID")]
[HttpGet]
- public object GetCheckItemID(string HName,string HProName)
+ public object GetCheckItemID(string HName,string HProName,string HSourceID)
{
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='"+HName+ "' and 宸ュ簭鍚嶇О='" + HProName + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='"+HName+ "' and 宸ュ簭鍚嶇О='" + HProName + "' and HSourceID='" + HSourceID + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
--
Gitblit v1.9.1