From e561870f9644a5e80925346485fe623da678177f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 14 十月 2025 10:20:57 +0800
Subject: [PATCH] 调整WMS出库逻辑，原辅料可选择成品库出库；
---
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index c1e7965..5676ea7 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
+using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using Model.ModelDto.SysDto;
@@ -82,7 +83,7 @@
Flag = m.Flag,
FlagName = GetFlag(m.Flag),
Make = m.Make,
- MakeName = m.Make == "0"? "璺戦亾": m.Make == "1" ? "鍌ㄤ綅":"",
+ MakeName = m.Make == "0" ? "璺戦亾" : m.Make == "1" ? "鍌ㄤ綅" : "",
Depth = m.Depth,
Row = m.Row,
Column = m.Column,
@@ -139,7 +140,7 @@
{
try
{
- var bl = LocatRst.EditStorageLocat(model.Id,model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
+ var bl = LocatRst.EditStorageLocat(model.Id, model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
@@ -274,7 +275,7 @@
{
c1 = c.ToString();
}
-
+
q += await LocatRst.AddAsync(new SysStorageLocat()
{
LocatNo = r1 + l1 + c1,
@@ -289,7 +290,7 @@
Layer = c,
CreateUser = userId
});
-
+
}
}
}
@@ -318,7 +319,7 @@
var depth = 0;
var depthString = "01";
// 鎺�(缁�)寰幆
- for (int i = 1; i <= model.Row; i++)
+ for (int i = 19; i <= model.Row; i++)
{
// 鍒楀惊鐜�
for (int z = 1; z <= model.Col; z++)
@@ -338,7 +339,7 @@
// //鍏朵綑鏉′欢
// }
//}
-
+
q += await LocatRst.AddAsync(new SysStorageLocat()
{
// 鍖哄煙+鎺�+鍒�+灞�
@@ -908,9 +909,9 @@
/// </summary>
/// <param name="roadwayNo">宸烽亾</param>
/// <returns></returns>
- public List<string> ByRoadwayGetRow(string roadwayNo)
+ public List<string> ByRoadwayGetRow(string wareHouseNo, string roadwayNo)
{
- string str = $"select Row from SysStorageLocat where IsDel = '0' and WareHouseNo = 'W01' and RoadwayNo = '{roadwayNo}' group by Row order by Row";
+ string str = $"select Row from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and RoadwayNo = '{roadwayNo}' group by Row order by Row";
List<string> row = Db.Ado.SqlQuery<string>(str);
return row;
@@ -974,5 +975,63 @@
}
#endregion
+
+ /// <summary>
+ /// 鑾峰彇鍌ㄤ綅淇℃伅(瀵嗛泦搴�)
+ /// </summary>
+ /// <param name="wareHouseNo">浠撳簱</param>
+ /// <param name="row">鎺�</param>
+ /// <returns></returns>
+ public async Task<BordModelVM> GetFlatLegend(string wareHouseNo, int layer)
+ {
+ var list = await Db.Queryable<SysStorageLocat>().Where(s => s.WareHouseNo == wareHouseNo && s.Layer == layer && s.IsDel == "0").ToListAsync();
+ BordModelVM listBord = new BordModelVM()
+ {
+ Col = 15,
+ Row = 21
+ };
+
+ foreach (var modLocat in list)
+ {
+ SlotsVm mod = new SlotsVm()
+ {
+ SlotColumn = modLocat.Column,
+ SlotRow = modLocat.Row,
+ SlotCode = modLocat.LocatNo,
+ //SlotStatusCls = modLocat.Flag!="0"? "eight": modLocat.Status == "0"? "zero":,
+ Make = modLocat.Make
+ };
+ if (modLocat.Flag != "0")
+ mod.SlotStatusCls = "eight";
+ switch (modLocat.Status)
+ {
+ case "0":
+ mod.SlotStatusCls = "zero";
+ break;
+ case "1":
+ mod.SlotStatusCls = "one";
+ break;
+ case "2":
+ mod.SlotStatusCls = "two";
+ break;
+ case "3":
+ mod.SlotStatusCls = "three";
+ break;
+ case "4":
+ mod.SlotStatusCls = "four";
+ break;
+ case "5":
+ mod.SlotStatusCls = "five";
+ break;
+ default:
+ break;
+ }
+ listBord.SlotsVm.Add(mod);
+ }
+
+ return listBord;
+
+ }
+
}
}
--
Gitblit v1.8.0