From 7150774e3fe4ac65653235f46d29eef0bfca2fcb Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 17 十二月 2025 12:54:44 +0800
Subject: [PATCH] 修改调度货架模板

---
 Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
index 351214e..6ec2f58 100644
--- a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
@@ -224,6 +224,7 @@
         {
             try
             {
+                string type = "2";//妯℃澘绫诲瀷
                 #region 鍒ゆ柇
 
                 if (string.IsNullOrWhiteSpace(areaNo) || string.IsNullOrWhiteSpace(endLocate) || string.IsNullOrWhiteSpace(plnStatus) )
@@ -292,6 +293,7 @@
                 else if (plnStatus == "2") 
                 {
                     stockDetail = stockDetail.Where(m => m.PalletStatus == "2" && m.SkuNo == skuNo && m.LotNo == lotNo && m.InspectStatus == "1").OrderBy(m => m.LocatNo).ToList();
+                    
                    
                 }
                 else
@@ -387,6 +389,12 @@
                     CreateTime = DateTime.Now
                 };
                 Db.Insertable(logTaskEntry).ExecuteCommand();
+
+                var endtype = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == endLocate);
+                if (plnStatus == "2" && endtype.Layer == 3)
+                {
+                    type = "1";    //涓嶈璐ф灦妯℃澘
+                }
                
                 //娌℃湁浜х敓绉诲簱浠诲姟灏辩洿鎺ョ粰灏忚溅涓嬪彂鍑哄簱浠诲姟锛岃嫢浜х敓绉诲簱浠诲姟绛夊皬杞︽妸绉诲簱鐨勬《鎶捣鏃跺啀涓嬪彂鍑哄簱浠诲姟
                 if (!resultYi)
@@ -398,7 +406,7 @@
                         Startport = palletModel.LocatNo,//璧峰浣嶇疆
                         Endport = endLocate,//鐩爣浣嶇疆
                         Pallno = palletModel.PalletNo,//妗跺彿
-                        Crtype = "1",//鍙《
+                        Crtype = type,//鍙《
                     };
 
                     string agvMsg = string.Empty;
@@ -463,7 +471,7 @@
         {
             try
             {
-                string type = "2";//鍙枡妯℃澘
+                
                 #region 鍒ゆ柇
                 if (string.IsNullOrWhiteSpace(areaNo) || string.IsNullOrWhiteSpace(StartLocate) || string.IsNullOrWhiteSpace(plnStatus))
                 {
@@ -513,10 +521,6 @@
                 //鐩爣妤煎眰
                 var layer = startLoction.Layer;
                 var houseStr = layer == 3 ? "3妤间腑闂寸珯" : layer == 4 ? "4妤间腑闂寸珯" : "";
-                if (layer == 3 && plnStatus == "2")
-                {
-                    type = "1"; 
-                }
                 //閫氳繃浠撳簱鍚嶇О鏌ヨ浠撳簱淇℃伅
                 var house = Db.Queryable<SysWareHouse>().First(m => m.IsDel == "0" && m.WareHouseName == houseStr);
                 if (house == null)
@@ -611,7 +615,7 @@
                     Startport = StartLocate,//璧峰浣嶇疆
                     Endport = endLocatInfo.LocatNo,//鐩爣浣嶇疆
                     Pallno = plnNo,//妗跺彿
-                    Crtype = type,//鍙溅妯℃澘
+                    Crtype = "2",//鍙溅妯℃澘
                 };
                 //璋冪敤AGV鎺ュ彛涓嬪彂浠诲姟
                 string agvMsg = string.Empty;

--
Gitblit v1.8.0