From eb81b325e971051ea29c48a033cfc6c759f1dc60 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 29 四月 2021 17:09:45 +0800
Subject: [PATCH] treetest
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 146 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 106 insertions(+), 40 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 719e7aa..ccf0739 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -479,13 +479,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustWorkOrderBillList ", "h_v_WW_EntrustWorkOrderBillList");
}
else
{
- string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 ";
+ string sql1 = "select * from h_v_WW_EntrustWorkOrderBillList where 1 = 1 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain");
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustWorkOrderBillList");
}
}
catch (Exception e)
@@ -498,43 +498,6 @@
}
return GetObjectJson(ds);
}
-
-
- /// <summary>
- /// 杩斿洖濮斿宸ュ簭姹囨姤鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
- [Route("Sc_ProcessMangement/MES_Sc_StationOutBillMain_Json")]
- [HttpGet]
- public object MES_Sc_StationOutBillMain_Json(string sWhere)
- {
- DataSet ds;
- try
- {
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain");
- }
- else
- {
- string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- return GetObjectJson(ds);
- }
-
/// <summary>
/// 杩斿洖涓嶅悎鏍艰瘎瀹″垪琛�
@@ -1359,7 +1322,110 @@
}
}
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭娲惧伐鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList ", "h_v_WW_EntrustProcSendWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭璁″垝姹囨姤鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessReportBillList ", "h_v_WW_EntrustProcessReportBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcessReportBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessReportBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭璁″垝杞嚭鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList ", "h_v_WW_EntrustProcessSendOutBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
}
--
Gitblit v1.9.1