From 35d7109801b437fad4514047db521ae358a1b7ca Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 30 六月 2025 14:11:25 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/SysController.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index 5a4679c..ce203ba 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -1100,8 +1100,8 @@
{
bolls = await _locatSvc.AddPkStorageLocat(model, 1);
}
-
-
+
+
if (bolls > 0)
{
await _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", model.RoadwayNo, "娣诲姞", "娣诲姞鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + model.RoadwayNo, 1);
@@ -1251,7 +1251,7 @@
var list = _locatSvc.GetStorageLocat();
foreach (var item in model.Id)
{
- storage = list.FirstOrDefault(m=>m.Id == item);
+ storage = list.FirstOrDefault(m => m.Id == item);
if (storage != null)
{
_operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "鎵归噺缂栬緫", "鎵归噺淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
@@ -1703,9 +1703,9 @@
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult ByRoadwayGetRow(string roadwayNo)
+ public IActionResult ByRoadwayGetRow(string wareHouseNo, string roadwayNo)
{
- List<string> row = _locatSvc.ByRoadwayGetRow(roadwayNo);
+ List<string> row = _locatSvc.ByRoadwayGetRow(wareHouseNo, roadwayNo);
return Ok(new
{
data = row,
--
Gitblit v1.8.0