From 3378439708add2bc40f4d6d77aebc11367e380fd Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 20 四月 2026 15:48:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/NewApiController.cs | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs
index 6686d48..0276c6d 100644
--- a/WebAPI/Controllers/NewApiController.cs
+++ b/WebAPI/Controllers/NewApiController.cs
@@ -31,6 +31,17 @@
public ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode)
{
var model = YqnQbService.GetHbarCodeDetail(sBillBarCode);
+ // 閫氳繃model 涓殑data鏉ュ垽鏂� 宸ュ崟鍙� 鏄惁灞炰簬寮�宸ョ姸鎬侊紝濡傛灉灞炰簬寮�宸ョ姸鎬侊紝鍒欐姤閿�
+ // string HProcExchBillStatus = model.data.Tables[0].Rows[0]["鍗曟嵁鐘舵��"]?.ToString();
+ // if(HProcExchBillStatus != null && HProcExchBillStatus != "3")
+ // {
+ // // 鍙湁寮�宸ョ姸鎬佸厑璁哥敓鎴愬彇鏍峰崟
+ // model.data = null;
+ // model.code = 0;
+ // model.count = 0;
+ // model.msg = $"宸ュ崟锛歿model.data.Tables[0].Rows[0]["鍗曟嵁鍙�"].ToString()} 涓嶄负寮�宸ョ姸鎬�! 涓嶅厑璁哥敓鎴愬彇鏍峰崟!";
+ // return model;
+ // }
return model;
}
/// <summary>
@@ -168,5 +179,71 @@
{
return YqnQbService.DeleteProcess(hItemId);
}
+ /// <summary>
+ /// 鑾峰彇涓嶈壇浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getBadWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetBadWHList(string sWhere)
+ {
+ return YqnQbService.GetBadWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇鎶ュ簾浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getWasterWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetWasterWHList(string sWhere)
+ {
+ return YqnQbService.GetWasterWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇鐮斿彂涓嶈壇鍝佷粨搴�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getBadCountDevelopWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetBadCountDevelopWHList(string sWhere)
+ {
+ return YqnQbService.GetBadCountDevelopWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇濮斿涓嶈壇浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getWWBadWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetWWBadWHList(string sWhere)
+ {
+ return YqnQbService.GetWWBadWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇濮斿鎶ュ簾浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getWWWasterWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetWWWasterWHList(string sWhere)
+ {
+ return YqnQbService.GetWWWasterWHList(sWhere);
+ }
+ /// <summary>
+ /// 鑾峰彇鑹搧浠撳簱
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("api/newBill/getWHList")]
+ [HttpGet]
+ public ApiResult<DataSet> GetWHList(string sWhere)
+ {
+ return YqnQbService.GetWHList(sWhere);
+ }
}
}
--
Gitblit v1.9.1