From e8338d93d543cf18e1e2ed780799664c35de6cf4 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 06 五月 2025 09:54:12 +0800
Subject: [PATCH] 修改获取任务模板
---
Admin.NET/WCS.Application/Util/AGVStorageUtil.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs b/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
index cb33fc5..b1746af 100644
--- a/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
+++ b/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
@@ -25,11 +25,12 @@
type1 = "";
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)
{
- return "";
+ return taskModle;
}
switch (locate1.WareHouseNo)
{
@@ -54,21 +55,60 @@
default:
break;
}
- var Area1002 = new List<string>() { "",""};//1002杞﹂棿鍖哄煙
- var Area1003 = new List<string>() { "",""};//1003杞﹂棿鍖哄煙
+ var AreaAll = new List<string>() { "B06", "B07" };//1002銆�1003鍏ㄩ儴鍖哄煙
+ var Area1002 = new List<string>() { "B06",""};//1002杞﹂棿鍖哄煙
+ var Area10031 = new List<string>() { ""};//1003 1妤艰溅闂村尯鍩�
+ var Area10032 = new List<string>() { "B07"};//1003 2妤艰溅闂村尯鍩�
if (Area1002.Contains(locate2.AreaNo))
{
jiebo = "1JB";//鎺ラ┏浣�
}
- if (Area1003.Contains(locate2.AreaNo))
+ if (Area10031.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo))
{
jiebo = "2JB";
}
if (type1 == "" || type2 == "")
{
- return "";
+ return taskModle;
}
- return "CJ1";
+ //鍒ゆ柇鑾峰彇浠诲姟妯℃澘 STORAGE 璐ф灦浠撲綅 SITE 骞冲簱浠撲綅 ZONE 鍖哄煙
+ switch (type1)
+ {
+ case "STORAGE" when type2 == "SITE":
+ {
+ taskModle = "FJ";
+ }
+ break;
+ case "SITE" when type2 == "STORAGE":
+ {
+ taskModle = "YCRK";
+ }
+ break;
+ case "SITE" when type2 == "SITE":
+ {
+ if (Area10032.Contains(locate1.AreaNo) && locate2.AreaNo == "B04")
+ {
+ taskModle = "CPRK";
+ }
+ else if(Area1002.Contains(locate1.AreaNo) && locate2.AreaNo == "B04")
+ {
+ taskModle = "CPRK2";
+ }
+ else if ((Area10032.Contains(locate2.AreaNo) || Area10032.Contains(locate2.AreaNo)) && !AreaAll.Contains(locate1.AreaNo))
+ {
+ taskModle = "YFLSX";
+ }
+ else if (Area1002.Contains(locate2.AreaNo) && !AreaAll.Contains(locate1.AreaNo))
+ {
+ taskModle = "YFLSX2";
+ }
+
+ }
+ break;
+ default:
+ break;
+ }
+ return taskModle;
}
}
--
Gitblit v1.8.0