From 50564fff2160dff6b515caedb72f43dbc1b908ad Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期二, 02 十二月 2025 15:00:58 +0800
Subject: [PATCH] 获取托盘明细GetBindList增加储位地址筛选还原代码
---
Wms/Wms/Controllers/StatisticalController.cs | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 21ace0d..6693ef9 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -9,6 +9,8 @@
using System.Threading.Tasks;
using Model.ModelDto.SysDto;
using WMS.BLL.LogServer;
+using Model.ModelVm.BllTaskVm;
+using Model.ModelVm;
namespace Wms.Controllers
{
@@ -23,6 +25,8 @@
private readonly IStockDetailServer _stockDetail; //缁熻鎶ヨ〃
private readonly IDataBoxInfoServer _dataBoxInfo; //瀵煎嚭
private readonly IStockInfoServer _stockInfo; //搴撳瓨淇℃伅
+
+
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -37,6 +41,76 @@
_dataBoxInfo = dataBoxInfo;
_stockInfo = stockInfo; //搴撳瓨淇℃伅
}
+
+
+ /// <summary>
+ /// 鑾峰彇搴撳瓨鐗╂枡绫诲瀷鍒嗗竷
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetGoodsTypeFb()
+ {
+ IEnumerable<IdNameNumRateDto> dtoIE = _stock.GetGoodsTypeFb();
+ return Ok(new
+ {
+ data = dtoIE,
+ code = 0,
+ msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+ });
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇搴撳瓨璐ㄩ噺鐘舵�佸垎甯�
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetQualityStatusFb()
+ {
+ IEnumerable<IdNameNumRateDto> dtoIE = _stock.GetQualityStatusFb();
+ return Ok(new
+ {
+ data = dtoIE,
+ code = 0,
+ msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+ });
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇浠撳簱鐘跺喌鎬�
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetWareHouseState()
+ {
+ WarehouseStateDto dto = _stock.GetWareHouseState();
+ return Ok(new
+ {
+ data = dto,
+ code = 0,
+ msg = "鑾峰彇浠撳簱姒傚喌鎴愬姛"
+ });
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇浠撳簱鐘跺喌璇︽儏
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetWareHouseStateInfo()
+ {
+ IEnumerable<WarehouseUseDto> dtoIE = _stock.GetWareHouseStateInfo();
+ return Ok(new
+ {
+ data = dtoIE,
+ code = 0,
+ msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+ });
+ }
+
+
#region 搴撳瓨鏄庣粏
@@ -92,6 +166,7 @@
#region 鎵樼洏鏄庣粏
+
/// <summary>
/// 鑾峰彇鎵樼洏鏄庣粏
/// </summary>
@@ -105,16 +180,19 @@
/// <param name="bitPalletMark">闆舵墭鏍囪</param>
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
+ /// <param name="ownerNo">璐т富缂栫爜</param>
+ /// <param name="ownerName">璐т富鍚嶇О</param>
+ /// <param name="startTime">寮�濮嬫椂闂�</param>
+ /// <param name="endTIme">缁撴潫鏃堕棿</param>
+ /// <param name="WareHouseNo">鎵�灞炰粨搴�</param>
+ /// <param name="AreaNo">鎵�灞炲尯鍩�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status,
- string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName,
- string startTime, string endTIme,string WareHouseNo,string AreaNo)
+ public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme, string WareHouseNo, string AreaNo)
{
try
{
- List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark,
- bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
+ List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -173,7 +251,7 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
+ public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
{
try
@@ -247,13 +325,16 @@
/// <param name="status">鐘舵��</param>
/// <param name="inspectMark">妫�楠屾爣璁�</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
+ /// <param name="locatNo">鍌ㄤ綅鍦板潃</param>
+ /// <param name="sortField">鎺掑簭瀛楁</param>
+ /// <param name="sortType">鎺掑簭鏂瑰紡</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus)
+ public IActionResult GetEmergencyWarning(string skuNo, string skuName, string lotNo, string palletNo, string status, string inspectMark, string inspectStatus, string locatNo, string sortField, string sortType)
{
try
{
- List<AdventBoxInfoDto> stockList = _dataBoxInfo.GetEmergencyWarning(skuNo, skuName, lotNo, palletNo, status, inspectMark, inspectStatus);
+ List<AdventBoxInfoDto> stockList = _dataBoxInfo.GetEmergencyWarning(skuNo, skuName, lotNo, palletNo, status, inspectMark, inspectStatus, locatNo, sortField, sortType);
return Ok(new { data = stockList, code = 0, msg = "鑾峰彇涓存湡棰勮鎴愬姛" });
}
catch (Exception e)
@@ -483,5 +564,26 @@
}
#endregion
+
+ #region#琛ユ墦鏍囩
+ /// <summary>
+ /// 琛ユ墦搴撳瓨鏄庣粏绠辩爜
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetBuDaLabelList(BuDaLabelBoxVm model)
+ {
+ try
+ {
+ var list = _dataBoxInfo.GetBuDaLabelList(model.BoxNo);
+ return Ok(new { code = 0, msg = "鑾峰彇琛ユ墦绠辩爜鏍囩淇℃伅", data = list });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, count = 0, msg = e.Message });
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.8.0