From 3a89a0b435821e074e781e5eb9eaebae16de01d6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期六, 24 八月 2024 16:28:36 +0800
Subject: [PATCH] PDA组托页面和平库入库托盘上架
---
Wms/Wms/Controllers/SysController.cs | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index d45cf4a..6136e07 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,17 @@
//{
// 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 = 0;
+ if (model.HouseNo == "W01")
+ {
+ bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
+ }
+ else
+ {
+ bolls = await _locatSvc.AddPkStorageLocat(model, 1);
+ }
+
+
if (bolls > 0)
{
await _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", model.RoadwayNo, "娣诲姞", "娣诲姞鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + model.RoadwayNo, 1);
@@ -1184,7 +1194,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);
@@ -1234,18 +1244,23 @@
var bolls = _locatSvc.EditStorageLocatList(model, _config.WcsHost + _config.EditLocateUrl, 1);//int.Parse(userId)
if (bolls)
{
- SysStorageLocat storage = _locatSvc.GetStorageLocat(model.Id[0]);
- string msg = "鍌ㄤ綅鐘舵�� 鍌ㄤ綅鍙凤細" + storage.RoadwayNo;
+ SysStorageLocat storage;
+ //string msg = "鍌ㄤ綅鐘舵�� 鍌ㄤ綅鍙凤細" + storage.RoadwayNo;
if (model.Id.Count > 1)
{
+ var list = _locatSvc.GetStorageLocat();
foreach (var item in model.Id)
{
- storage = _locatSvc.GetStorageLocat(item);
- _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "鎵归噺缂栬緫", "鎵归噺淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
+ storage = list.FirstOrDefault(m=>m.Id == item);
+ if (storage != null)
+ {
+ _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "鎵归噺缂栬緫", "鎵归噺淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
+ }
}
}
else
{
+ storage = _locatSvc.GetStorageLocat(model.Id[0]);
_operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "淇敼", "淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
}
@@ -2048,7 +2063,7 @@
/// <returns></returns>
[HttpGet]
public IActionResult GetAvailabilityRoadry()
- {
+ {
try
{
var list = _locatSvc.GetAvailabilityRoadry();
@@ -2164,11 +2179,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 +2225,7 @@
{
return Ok(new { data = "", code = 1, msg = $"鎿嶄綔澶辫触锛歿e.Message}" });
}
-
+
}
#endregion
--
Gitblit v1.8.0