From 9d93f219367a57659c6641319922dee224e68d39 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 09 八月 2022 16:57:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/PublicPageMethodController.cs | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 653af57..a399375 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -34,7 +34,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -108,7 +108,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -140,7 +140,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -214,7 +214,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -245,7 +245,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -319,7 +319,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -350,7 +350,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -424,7 +424,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -455,7 +455,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -529,7 +529,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -770,7 +770,7 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName,HModel from h_v_Gy_Mould Order by HNumber", "h_v_Gy_Mould");
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName,HModel,HDesignLife,HUseLife,HLeaveLife from h_v_Gy_Mould Order by HNumber", "h_v_Gy_Mould");
}
else
{
@@ -2228,7 +2228,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2302,7 +2302,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2333,7 +2333,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2438,7 +2438,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.Message = "褰撳墠缁勭粐鏁版嵁鏈淮鎶わ紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3566,5 +3566,66 @@
}
#endregion
+ #region 鑾峰彇鏍哥畻鏂瑰紡鍒楄〃
+ /// <summary>
+ /// 鑾峰彇鏍哥畻鏂瑰紡鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("PublicPageMethod/GetClassTimePrjList_Json")]
+ [HttpGet]
+ public object GetClassTimePrjList_Json(string Gy_ClassTimePrj)
+ {
+ string sWhere = "";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (Gy_ClassTimePrj != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + Gy_ClassTimePrj + "%' or HName like '%" + Gy_ClassTimePrj + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_ClassTimePrj where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrj");
+ }
+ else
+ {
+ string sql1 = "Select HItemID,HNumber ,HName from Gy_ClassTimePrj where HStopflag=0 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrj");
+ }
+
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
--
Gitblit v1.9.1