From 4aa0b9c9c2c56ec1af1dc3ee8ef12c9374b3d1ff Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 27 十一月 2025 11:36:08 +0800
Subject: [PATCH] 修改车间记录列表数据显示异常问题
---
Wms/Wms/Controllers/StatisticalController.cs | 159 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 145 insertions(+), 14 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 10798d0..63db2a4 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -7,6 +7,10 @@
using WMS.IBLL.IDataServer;
using System.Security.Claims;
using System.Threading.Tasks;
+using Model.ModelDto.SysDto;
+using WMS.BLL.LogServer;
+using Model.ModelVm.BllTaskVm;
+using Model.ModelVm;
namespace Wms.Controllers
{
@@ -21,6 +25,8 @@
private readonly IStockDetailServer _stockDetail; //缁熻鎶ヨ〃
private readonly IDataBoxInfoServer _dataBoxInfo; //瀵煎嚭
private readonly IStockInfoServer _stockInfo; //搴撳瓨淇℃伅
+
+
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -35,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 搴撳瓨鏄庣粏
@@ -51,9 +127,9 @@
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> GetInventoryList(string selectType, string skuNo, string skuName, string ownerNo, string ownerName, string lotNo, string status, string inspectStatus)
+ public async Task<IActionResult> GetInventoryList(string selectType, string skuNo, string skuName, string ownerNo, string ownerName, string lotNo, string status, string inspectStatus, string wareHouseNo, string areaNo)
{
- List<MateDataStockDto> StockList = await _stock.GetDataStockList(selectType, skuNo, skuName, ownerNo, ownerName, lotNo, status, inspectStatus);
+ List<MateDataStockDto> StockList = await _stock.GetDataStockList(selectType, skuNo, skuName, ownerNo, ownerName, lotNo, status, inspectStatus, wareHouseNo, areaNo);
return Ok(new
{
data = StockList,
@@ -105,13 +181,11 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</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)
+ 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);
+ 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)
@@ -119,6 +193,40 @@
return Ok(new { data = "", code = 0, msg = e.Message });
}
+ }
+ /// <summary>
+ /// 鎵樼洏鏄庣粏澶囨敞
+ /// </summary>
+ /// <param name="id"></param>
+ /// <param name="demo"></param>
+ /// <param name="userId"></param>
+ /// <exception cref="Exception"></exception>
+ [HttpGet]
+ public IActionResult EditStockDetailDemo(int id, string demo)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ _stockDetail.EditStockDetailDemo(id, demo, int.Parse(userId));
+
+
+ return Ok(new { code = 0, msg = "缂栬緫澶囨敞鎴愬姛" });
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
}
/// <summary>
@@ -136,12 +244,13 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
- string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
+ 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
{
- List<DataBoxInfo> boxInfo = _dataBoxInfo.GetDataBoxInfo(id, skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitBoxMark, inspectStatus);
+ List<DataBoxInfo> boxInfo = _dataBoxInfo.GetDataBoxInfo(id, skuNo, skuName, palletNo,
+ lotNo, boxNo, status, inspectMark, bitBoxMark, inspectStatus, WareHouseNo, AreaNo);
return Ok(new { data = boxInfo, code = 0, msg = "鑾峰彇绠辩爜鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -327,11 +436,12 @@
/// </summary>
/// <param name="skuNo"></param>
/// <param name="skuName"></param>
+ /// <param name="InspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryListDaoChu(string skuNo, string skuName)
+ public IActionResult GetInventoryListDaoChu(string skuNo, string skuName, string InspectStatus)
{
- List<MateDataStockDto> StockList = _stock.GetDataStockListDaoChu(skuNo, skuName);
+ List<MateDataStockDto> StockList = _stock.GetDataStockListDaoChu(skuNo, skuName, InspectStatus);
return Ok(new
{
data = StockList,
@@ -339,7 +449,7 @@
msg = "瀵煎嚭搴撳瓨鎬婚噺鎴愬姛"
});
}
- /// <summary>
+ /// <summary>GetDataStockListDaoChu
/// 瀵煎嚭搴撳瓨鏄庣粏
/// </summary>
/// <param name="skuNo">鐗╂枡缂栫爜</param>
@@ -351,9 +461,9 @@
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string startTime, string endTime)
+ public IActionResult GetDataStockList1DaoChu(string skuNo, string skuName, string lotNo, string locatNo, string status, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
{
- List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1DaoChu(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, startTime, endTime);
+ List<StockDetailDto> stockDetailsList = _stock.GetDataStockList1DaoChu(skuNo, skuName, lotNo, locatNo, status, inspectStatus, ownerNo, ownerName, startTime, endTime);
return Ok(new
{
data = stockDetailsList,
@@ -444,5 +554,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