From 88dd0bb81e2d4e6d560e7b62bbe0a9c141c84a41 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 20 九月 2025 16:21:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.BLL/SysServer/StorageAreaServer.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
index aafcdac..31d77b9 100644
--- a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
@@ -155,24 +155,35 @@
return str;
}
//鑾峰彇绔嬩綋搴撴渶澶х紪鐮�
- var area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0").OrderByDescending(a=>a.CreateTime).First();
- //楠岃瘉鏄惁瀛樺湪鍖哄煙淇℃伅
- if (area == null)
+ var area = new SysStorageArea();
+ string areaStr = "A";
+ if (model.WareHouseNo == "W04")
{
- model.AreaNo = "A01";
+ area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0" && a.WareHouseNo == "W04").OrderByDescending(a => a.CreateTime).First();
+ areaStr = "B";
}
else
{
- var arr = area.AreaNo.Split("A");
+ area = Db.Queryable<SysStorageArea>().Where(a => a.IsDel == "0" && (a.WareHouseNo == "W01" || a.WareHouseNo == "W02")).OrderByDescending(a => a.CreateTime).First();
+ }
+
+ //楠岃瘉鏄惁瀛樺湪鍖哄煙淇℃伅
+ if (area == null)
+ {
+ model.AreaNo = $"{areaStr}01";
+ }
+ else
+ {
+ var arr = area.AreaNo.Split(areaStr);
int a = int.Parse(arr[1]) + 1;
//鍒ゆ柇鏄惁灏忎簬10
if (a < 10)
{
- model.AreaNo = "A0" + (int.Parse(arr[1]) + 1).ToString();
+ model.AreaNo = $"{areaStr}0" + (int.Parse(arr[1]) + 1).ToString();
}
else
{
- model.AreaNo = "A" + (int.Parse(arr[1]) + 1).ToString();
+ model.AreaNo = $"{areaStr}" + (int.Parse(arr[1]) + 1).ToString();
}
}
--
Gitblit v1.8.0