From 2d33e01ccb5085171653876daf630f8c09909d76 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 22 四月 2021 17:15:02 +0800
Subject: [PATCH] 新增工序出站、进站模块-合并
---
WebAPI/Controllers/WebAPIController.cs | 102 ++++++++++++++++++++++++++-------------------------
1 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 43c62a4..84bae22 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -999,61 +999,63 @@
/// 鑾峰彇宸ュ簭璁″垝鍗曞垪琛�
/// </summary>
/// <returns></returns>
- //[Route("Web/GetPlanList_Json")]
- //[HttpGet]
- //public object GetPlanList_Json(string Billno)
- //{
- // //sWhere = " Where HStopFlag=0 and HEndFlag=1";
- // //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
- // if (Billno != "")
- // {
- // sWhere = sWhere + " and ( 鍗曟嵁鍙� like '%" + Billno + "%' ) ";
- // }
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sWhere == null || sWhere.Equals(""))
+ [Route("Web/GetPlanList_Json")]
+ [HttpGet]
+ public object GetPlanList_Json(string Billno)
+ {
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (Billno != "")
+ {
+ sWhere = sWhere + " and ( 鍗曟嵁鍙� like '%" + Billno + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from h_v_Sc_ProcessPlanList where HStopflag=0 Order by HItemID ", "Gy_BadReason");
- // }
- // else
- // {
- // string sql1 = "Select HItemID,HNumber ,HName from Gy_BadReason where HStopflag=0 and HEndFlag=1 ";
- // string sql = sql1 + sWhere;
- // ds = oCN.RunProcReturn(sql, "Gy_BadReason");
- // }
+ {
+ ds = oCN.RunProcReturn("select hmainid,hsubid,鍗曟嵁鍙�,HMaterID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,HCenterID,宸ヤ綔涓績,瑙勬牸鍨嬪彿,璁″垝鏁伴噺 from h_v_Sc_ProcessPlanList", "h_v_Sc_ProcessPlanList");
+ }
+ else
+ {
+ string sql1 = "select hmainid,hsubid,鍗曟嵁鍙�,HMaterID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,HCenterID,宸ヤ綔涓績,瑙勬牸鍨嬪彿,璁″垝鏁伴噺 from h_v_Sc_ProcessPlanList where 1=1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList");
+ }
- // //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
- // 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 = "0";
- // objjson.count = 1;
- // objjson.Message = "鑾峰彇鎴愬姛!";
- // objjson.data = ds.Tables[0];
- // return objjson;
- // }
- // }
- // catch (Exception ex)
- // {
+ 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 = "0";
+ 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;
- // }
- //}
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
#endregion
}
--
Gitblit v1.9.1