From 01685f3ab68f64b51b83eee40af90f4030866691 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 03 六月 2025 18:18:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Service/LuBaoSevice.cs | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 202 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
index fe5ad52..8b12c75 100644
--- a/WebAPI/Service/LuBaoSevice.cs
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -638,9 +638,88 @@
public static DataSet GetGy_ProjectMoneyDb(string HID)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_ProjectMoney where HItemID= " + HID + " ", "h_v_Gy_ProjectMoney");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_ProjectMoneyEdit where HItemID= " + HID + " ", "h_v_Gy_ProjectMoneyEdit");
return dataSet;
}
+
+ /// <summary>
+ /// 椤圭洰璐圭敤鍒嗙被鏍规嵁id鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_ProjectMoneyClassDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_ProjectMoneyClassDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄩ」鐩垂鐢ㄥ垎绫绘暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_ProjectMoneyClassDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_ProjectMoneyClassEdit where HItemID= " + HID + " ", "h_v_Gy_ProjectMoneyClassEdit");
+ return dataSet;
+ }
+
+
+ /// <summary>
+ /// 璁惧鑺傛媿鏍规嵁id鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetEqiupMaterWorkTimeDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetEqiupMaterWorkTimeDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄨ澶囪妭鎷嶆暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetEqiupMaterWorkTimeDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EqiupMaterWorkTimes where HItemID= " + HID + " ", "h_v_Sb_EqiupMaterWorkTimes");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// 绠″緞鏍规嵁id鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_PiPeDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_PiPeDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ寰勬暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_PiPeDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_PiPeEdit where HItemID= " + HID + " ", "h_v_Gy_PiPeEdit");
+ return dataSet;
+ }
+
+
+ /// <summary>
+ /// 椤圭洰璐圭敤鍒嗙被鏍规嵁id鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_PiPeMaterialDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_PiPeMaterialDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ寰勬潗璐ㄦ暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_PiPeMaterialDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_PiPeMaterialEdit where HItemID= " + HID + " ", "h_v_Gy_PiPeMaterialEdit");
+ return dataSet;
+ }
+
/// <summary>
/// 闃查敊瑁呯疆鏍规嵁id鑾峰彇淇℃伅
@@ -660,6 +739,103 @@
var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_PreventErrMould where HItemID= " + HID + " ", "h_v_Gy_PreventErrMould");
return dataSet;
}
+
+ /// <summary>
+ /// 浼戞伅鏃ユ牴鎹甶d鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_RestDayDetailEdit(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "鍚嶇О涓嶈兘涓虹┖" };
+ var dataSet = GetGy_RestDayEditDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ紤鎭棩鏁版嵁" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_RestDayEditDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select * from h_v_Gy_RestDay where HItemID= '" + HID + "' ", "h_v_Gy_RestDay");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// 鐜妫�娴嬪崟鏍规嵁id鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_EnvironmentTestItemEdit(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_EnvironmentTestItemDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ楠屼华鍣ㄦ暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_EnvironmentTestItemDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_EnvironmentTestItem where HItemID= " + HID + " ", "h_v_Gy_EnvironmentTestItem");
+ return dataSet;
+ }
+
+
+ /// <summary>
+ /// 浼戞伅鏃ユ牴鎹櫥褰曚汉鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_RestDayDetail(string HName)
+ {
+ if (string.IsNullOrEmpty(HName))
+ return new ApiResult<DataSet> { code = -1, msg = "鍚嶇О涓嶈兘涓虹┖" };
+ var dataSet = GetGy_RestDayDb(HName);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ紤鎭棩鏁版嵁" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_RestDayDb(string HName)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select a.HDeptID,b.HNumber 閮ㄩ棬缂栫爜,b.HName 閮ㄩ棬鍚嶇О,c.HNumber 缁勭粐缂栫爜,c.Hname 缁勭粐鍚嶇О from Gy_Czygl a left join Gy_Department b on a.HDeptID = b.HItemID left join Xt_ORGANIZATIONS c on a.HUSEORGID = c.HItemID where a.Czymc = '" + HName + "' ", "Gy_Czygl");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// 淇濆吇绾у埆鏍规嵁id鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_MaintainLevDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_MaintainLevDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ繚鍏荤骇鍒暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_MaintainLevDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_MaintainLev where HItemID= " + HID + " ", "h_v_Gy_MaintainLev");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// 鍚姩妫�鏌ラ」鐩牴鎹甶d鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_CheckNoteItemDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_CheckNoteItemDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ惎鍔ㄦ鏌ラ」鐩暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ public static DataSet GetGy_CheckNoteItemDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_CheckNoteItem where HItemID= " + HID + " ", "h_v_Gy_CheckNoteItem");
+ return dataSet;
+ }
+
/// <summary>
/// 椤圭洰绫诲埆鏍规嵁id鑾峰彇淇℃伅
@@ -730,6 +906,31 @@
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ鎴峰垎绫绘暟鎹�" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
+
+ /// <summary>
+ ///宸ヨ壓鍝佸弬鏁板垎绫绘牴鎹甶d鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_TechnologyType(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_TechnologyTypeDb(HID);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ伐鑹哄弬鏁板垎绫绘暟鎹�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+
+ /// <summary>
+ ///宸ヨ壓鍝佸弬鏁板垎绫绘牴鎹甶d鑾峰彇淇℃伅璋冪敤鎸佷箙灞�
+ /// </summary>
+ public static DataSet GetGy_TechnologyTypeDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_Technology where HItemID= " + HID + " ", "h_v_Gy_Technology");
+ return dataSet;
+ }
+
+
public static DataSet GetGy_CusTypeDb(string HID)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
--
Gitblit v1.9.1