From 1a29ad0fea9932f3d0bb56c939ccc32c877a34d8 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 19 二月 2024 16:08:59 +0800
Subject: [PATCH] 1
---
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 128feea..c139dd7 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -62,6 +62,7 @@
var data = LocatRst.GetAllByOrderPageAsync(item, limit, page,out int counts)
.Includes(x => x.WareHouseInfo)
.Includes(x => x.AreaInfo)
+ .Includes(x => x.RoadwayInfo)
.Includes(x => x.TemperatureInfo)
.Includes(x => x.CreateUserInfo)
.Includes(x => x.UpdateUserInfo).ToList();
@@ -70,8 +71,11 @@
{
Id = m.Id,
LocatNo = m.LocatNo,
+ WareHouseNo = m.WareHouseNo,
WareHouseName = m.WareHouseInfo == null ? "" : m.WareHouseInfo.WareHouseName,
RoadwayNo = m.RoadwayNo,
+ RoadwayName = m.RoadwayInfo == null ? "" : m.RoadwayInfo.RoadwayName,
+ AreaNo = m.AreaNo,
AreaName = m.AreaInfo == null ? "" : m.AreaInfo.AreaName,
Status = m.Status,
StatusName = GetStatus(m.Status),
@@ -217,6 +221,52 @@
throw new Exception(e.Message);
}
}
+
+ /// <summary>
+ /// 娣诲姞鍌ㄤ綅淇℃伅锛堝钩搴擄級鐢ㄤ簬寮�鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <param name="userId"></param>
+ /// <returns></returns>
+ public async Task<int> AddPkStorageLocat(AddLocateVm model, int userId)
+ {
+ try
+ {
+ var q = 0;
+ // 鎺�(缁�)寰幆
+ for(int i=1;i<=model.Row;i++)
+ {
+ // 鍒楀惊鐜�
+ for (int z = 1; z <= model.Col; z++)
+ {
+ q += await LocatRst.AddAsync(new SysStorageLocat()
+ {
+ // 鍖哄煙+鎺�+鍒�+灞�
+ LocatNo = model.AreaNo + i.ToString().PadLeft(2, '0') + z.ToString().PadLeft(2, '0') + "01",
+ WareHouseNo = model.HouseNo,
+ RoadwayNo = "",
+ AreaNo = model.AreaNo,
+ Status = "0",
+ AisleOne = "1",
+ AisleTwo = "",
+ Flag = "0",
+ Depth = z.ToString(),
+ Row = i,
+ Column = z,
+ Layer = 1,
+ CreateUser = userId
+ }); ;
+ }
+ }
+
+ return q;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
public bool EditStorageLocatList(EditLocateListVm model, int userId)
{
try
@@ -306,17 +356,14 @@
/// <param name="wareHouseNo">浠撳簱</param>
/// <param name="roadway">宸烽亾鍙�</param>
/// <param name="row">鎺� 1 or 2</param>
+ /// <param name="depth">娣卞害</param>
/// <returns></returns>
- public List<SysStorageLocat> GetStorageLocatLists(string wareHouseNo, string roadway, string row)
+ public List<SysStorageLocat> GetStorageLocatLists(string wareHouseNo, string roadway, string row, string depth)
{
try
{
- var road = roadway.Substring(1, roadway.Length - 1);
- var num = int.Parse(road);
- var rows = (num - 1) * 2 + int.Parse(row);//鎺�
-
var list = Db.Queryable<SysStorageLocat>().Where(m =>
- m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).ToList();
+ m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row) && m.Depth == depth).ToList();
return list;
}
@@ -343,7 +390,7 @@
var rows = (num - 1) * 2 + int.Parse(row);//鎺�
var maxLayer = Db.Queryable<SysStorageLocat>().Where(m =>
- m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).Max(m=>m.Layer);
+ m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m=>m.Layer);
return maxLayer;
}
@@ -369,7 +416,7 @@
var rows = (num - 1) * 2 + int.Parse(row);//鎺�
var maxColumn = Db.Queryable<SysStorageLocat>().Where(m =>
- m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == rows).Max(m => m.Column);
+ m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m => m.Column);
return maxColumn;
}
@@ -588,7 +635,7 @@
{
try
{
- string str = "select RoadwayNo,RoadwayName from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
+ string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
{
--
Gitblit v1.8.0