From 7b2b1648b9ecc40eb15b66bb3040663e5ba4114a Mon Sep 17 00:00:00 2001 From: WYB <908761037@qq.com> Date: 星期一, 26 四月 2021 21:16:38 +0800 Subject: [PATCH] 1.工序汇报单基础打印完成模板待调试设计 2.增加委外工序派工单列表 3.增加委外工序计划转出单列表 4.增加委外工序汇单列表 --- WebAPI/Controllers/Sc_ProcessMangementController.cs | 140 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 103 insertions(+), 37 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 719e7aa..2f15d68 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -499,43 +499,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> /// 杩斿洖涓嶅悎鏍艰瘎瀹″垪琛� /// </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