From 969aafa8bd335025da4caf5939a1626bad4f4236 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 19 六月 2025 16:54:03 +0800
Subject: [PATCH] Merge branch 'csc'
---
Admin.NET/WCS.Application/Util/AGVStorageUtil.cs | 86 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs b/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
index b1746af..2ab7192 100644
--- a/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
+++ b/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
@@ -26,47 +26,69 @@
type2 = "";
jiebo = "";
var taskModle = "";//浠诲姟妯℃澘
- var locate1 = _db.Queryable<WcsStorageLocat>().First(m => m.IsDelete == false && m.LocatNo == straLocate);
- var locate2 = _db.Queryable<WcsStorageLocat>().First(m => m.IsDelete == false && m.LocatNo == endLocate);
- if (locate1 == null || locate2 == null)
+ //鍓嶇紑L绔嬪簱 鍓嶇紑B 骞冲簱
+ var locate1q = straLocate.Substring(0,1);
+ var locate2q = endLocate.Substring(0, 1);
+
+ if (locate1q == null || locate2q == null)
{
return taskModle;
}
- switch (locate1.WareHouseNo)
+ switch (locate1q)
{
- case "W02":
- type1 = "SITE";
- break;
- case "W04":
+ case "L":
type1 = "STORAGE";
+ break;
+ case "B":
+ type1 = "SITE";
break;
default:
break;
}
- switch (locate2.WareHouseNo)
+ switch (locate2q)
{
- case "W02":
- type2 = "SITE";
- break;
- case "W04":
+ case "L":
type2 = "STORAGE";
+ break;
+ case "B":
+ type2 = "SITE";
break;
default:
break;
}
- var AreaAll = new List<string>() { "B06", "B07" };//1002銆�1003鍏ㄩ儴鍖哄煙
- var Area1002 = new List<string>() { "B06",""};//1002杞﹂棿鍖哄煙
- var Area10031 = new List<string>() { ""};//1003 1妤艰溅闂村尯鍩�
+
+ var AreaAll = new List<string>() { "B06", "B07", "B09" };//1002銆�1003鍏ㄩ儴鍖哄煙
+ var Area1002 = new List<string>() { "B06"};//1002杞﹂棿鍖哄煙
+ var Area10031 = new List<string>() { "B09"};//1003 1妤艰溅闂村尯鍩�
var Area10032 = new List<string>() { "B07"};//1003 2妤艰溅闂村尯鍩�
- if (Area1002.Contains(locate2.AreaNo))
+
+ var locate1 = _db.Queryable<WcsStorageLocat>().First(m => m.IsDelete == false && m.LocatNo == straLocate);
+ var locate2 = _db.Queryable<WcsStorageLocat>().First(m => m.IsDelete == false && m.LocatNo == endLocate);
+
+ if (locate1q == "B" )
{
- jiebo = "1JB";//鎺ラ┏浣�
+ if ( Area1002.Contains(locate1.AreaNo) )
+ {
+ jiebo = "1JB";//鎺ラ┏浣�
+ }
+ if (Area10031.Contains(locate1.AreaNo) || Area10032.Contains(locate1.AreaNo))
+ {
+ jiebo = "2JB";
+ }
}
- if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo))
+ if (locate2q == "B")
{
- jiebo = "2JB";
+ if ( Area1002.Contains(locate2.AreaNo))
+ {
+ jiebo = "1JB";//鎺ラ┏浣�
+ }
+ if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo))
+ {
+ jiebo = "2JB";
+ }
}
+
if (type1 == "" || type2 == "")
{
return taskModle;
@@ -77,32 +99,40 @@
case "STORAGE" when type2 == "SITE":
{
taskModle = "FJ";
+
}
break;
case "SITE" when type2 == "STORAGE":
{
- taskModle = "YCRK";
+ taskModle = "YCRK";
+ if (locate1.AreaNo == "B10")
+ {
+ taskModle = "DPJRK";
+ }
}
break;
case "SITE" when type2 == "SITE":
{
- if (Area10032.Contains(locate1.AreaNo) && locate2.AreaNo == "B04")
+ if ((Area10032.Contains(locate1.AreaNo) || Area10031.Contains(locate1.AreaNo)) && locate2.AreaNo == "B04")
{
- taskModle = "CPRK";
+ taskModle = "CPRK1003";
}
else if(Area1002.Contains(locate1.AreaNo) && locate2.AreaNo == "B04")
{
- taskModle = "CPRK2";
+ taskModle = "CPRK1002";
}
- else if ((Area10032.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo)) && !AreaAll.Contains(locate1.AreaNo))
+ else if ((Area10032.Contains(locate2.AreaNo) || Area10031.Contains(locate2.AreaNo)) && !AreaAll.Contains(locate1.AreaNo))
{
- taskModle = "YFLSX";
+ taskModle = "YCLSX";
}
else if (Area1002.Contains(locate2.AreaNo) && !AreaAll.Contains(locate1.AreaNo))
{
- taskModle = "YFLSX2";
+ taskModle = "YCLSX2";
}
-
+ else if (locate2.AreaNo == "B10")
+ {
+ taskModle = "PF-FMR-STACK-NOTIFY-TASK";
+ }
}
break;
default:
--
Gitblit v1.8.0