From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/Wms/Controllers/SysController.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index d45cf4a..d177afc 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -955,7 +955,7 @@
{
return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _roadwaySvc.EditStorageRoadway(model.Id, model.RoadwayName, model.Priority, model.Type, model.Temp,model.Availa, int.Parse(userId));
+ var bolls = _roadwaySvc.EditStorageRoadway(model.Id, model.RoadwayName, model.Priority, model.Type, model.Temp, model.Availa, int.Parse(userId));
if (bolls)
{
SysStorageRoadway storage = _roadwaySvc.GetStorageRoadway(model.Id);
@@ -1091,7 +1091,7 @@
//{
// return Ok(new { code = 400, ErrorMsg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
//}
- var bolls = await _locatSvc.AddStorageLocat(model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
+ var bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
if (bolls > 0)
{
await _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", model.RoadwayNo, "娣诲姞", "娣诲姞鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + model.RoadwayNo, 1);
@@ -1184,7 +1184,7 @@
{
return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _locatSvc.EditStorageLocat(model, _config.WcsHost + _config.EditLocateUrl,int.Parse(userId));
+ var bolls = _locatSvc.EditStorageLocat(model, _config.WcsHost + _config.EditLocateUrl, int.Parse(userId));
if (bolls)
{
SysStorageLocat storage = _locatSvc.GetStorageLocat(model.Id);
@@ -2048,7 +2048,7 @@
/// <returns></returns>
[HttpGet]
public IActionResult GetAvailabilityRoadry()
- {
+ {
try
{
var list = _locatSvc.GetAvailabilityRoadry();
@@ -2164,11 +2164,11 @@
#region 鏁版嵁褰掓。
[HttpGet]
- public IActionResult GetArchivingLogList(int Page=1, int Limit=10)
+ public IActionResult GetArchivingLogList(int Page = 1, int Limit = 10)
{
try
{
- var list = _archiving.GetArchivingLogList(Page,Limit, out int count);
+ var list = _archiving.GetArchivingLogList(Page, Limit, out int count);
return Ok(new
{
data = list,
@@ -2210,7 +2210,7 @@
{
return Ok(new { data = "", code = 1, msg = $"鎿嶄綔澶辫触锛歿e.Message}" });
}
-
+
}
#endregion
--
Gitblit v1.8.0