From 274db11b6606fb03bf269c73d9aa1722e92d23a1 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期日, 23 一月 2022 20:33:25 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/生产管理/报工台工序/Sc_MESReturnStepWorkBillController.cs | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs" index 8f365e1..4d9aebe 100644 --- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs" +++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESReturnStepWorkBillController.cs" @@ -73,6 +73,41 @@ #endregion + #region 鑾峰彇杩斿伐宸ュ簭涓嬫媺妗嗘暟鎹�(鎵�鏈夊伐搴�) + [Route("Sc_MESReturnStepWorkBill/GetMESReturnStepSelectBill")] + [HttpGet] + public object GetMESReturnStepSelectBill() + { + try + { + ds = oCN.RunProcReturn("select HItemID,宸ュ簭浠g爜,宸ュ簭鍚嶇О from h_v_Gy_ProcessList ", "h_v_Gy_ProcessList"); + if (ds.Tables[0].Rows.Count > 0) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲伐搴忔暟鎹�,璇风淮鎶わ紒"; + objJsonResult.data =null; + } + return objJsonResult; + } + catch (Exception ex) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region[杩斿伐鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁] [Route("Sc_MESReturnStepWorkBill/Sc_MESReturnStepWorkBillListCheckDetai")] [HttpGet] -- Gitblit v1.9.1