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 | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs b/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
index 141f599..2ab7192 100644
--- a/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
+++ b/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
@@ -66,13 +66,24 @@
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" || locate2q == "B")
+ if (locate1q == "B" )
{
- if (Area1002.Contains(locate2.AreaNo) || Area1002.Contains(locate1.AreaNo))
+ if ( Area1002.Contains(locate1.AreaNo) )
{
jiebo = "1JB";//鎺ラ┏浣�
}
- if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo) || Area10031.Contains(locate1.AreaNo) || Area10032.Contains(locate1.AreaNo))
+ if (Area10031.Contains(locate1.AreaNo) || Area10032.Contains(locate1.AreaNo))
+ {
+ jiebo = "2JB";
+ }
+ }
+ if (locate2q == "B")
+ {
+ if ( Area1002.Contains(locate2.AreaNo))
+ {
+ jiebo = "1JB";//鎺ラ┏浣�
+ }
+ if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo))
{
jiebo = "2JB";
}
@@ -88,11 +99,16 @@
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":
@@ -113,7 +129,10 @@
{
taskModle = "YCLSX2";
}
-
+ else if (locate2.AreaNo == "B10")
+ {
+ taskModle = "PF-FMR-STACK-NOTIFY-TASK";
+ }
}
break;
default:
--
Gitblit v1.8.0