From dbfd38c9f09c0d057c1f762e808a741081ff7dcf Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期一, 22 九月 2025 18:11:41 +0800
Subject: [PATCH] 托盘明细备注
---
Wms/Wms/Controllers/StatisticalController.cs | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 10798d0..21ace0d 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -7,6 +7,8 @@
using WMS.IBLL.IDataServer;
using System.Security.Claims;
using System.Threading.Tasks;
+using Model.ModelDto.SysDto;
+using WMS.BLL.LogServer;
namespace Wms.Controllers
{
@@ -51,9 +53,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,
@@ -106,12 +108,13 @@
/// <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 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);
+ bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -119,6 +122,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>
@@ -137,11 +174,12 @@
/// <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)
+ 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 +365,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 +378,7 @@
msg = "瀵煎嚭搴撳瓨鎬婚噺鎴愬姛"
});
}
- /// <summary>
+ /// <summary>GetDataStockListDaoChu
/// 瀵煎嚭搴撳瓨鏄庣粏
/// </summary>
/// <param name="skuNo">鐗╂枡缂栫爜</param>
@@ -351,9 +390,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,
--
Gitblit v1.8.0