From 48df8080d7befac9fff4f5345750699c592512f6 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 07 五月 2025 08:21:28 +0800
Subject: [PATCH] 修改问题

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

diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 398927b..88bb8bb 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -3347,7 +3347,8 @@
 
                 #endregion
                 var com = new Common();
-                
+                var allot = new AllotLocation();
+
                 var notice = Db.Queryable<BllExportNotice>().First(m => m.SONo == soNo && m.IsDel == "0");
                 if (notice == null)
                 {
@@ -3524,10 +3525,11 @@
                                                 PalletNo = item.PalletNo,//鎵樼洏鍙�
                                                 StartLocate = locate.LocatNo, // 璧峰浣嶇疆
                                                 StartRoadway = locate.RoadwayNo,//鍏跺疄宸烽亾
-                                                EndLocate = toLocation,//outMode, // 鐩爣浣嶇疆 
+                                                EndLocate = moveAddress,//outMode, // 鐩爣浣嶇疆 
                                                 TaskNo = ykTaskNo, // 浠诲姟鍙�
-                                                TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�  
+                                                TaskType = "2",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�  
                                                 Order = Math.Abs(row2 - rows),
+                                                Type = PLCTypeEnum.ShuttleCar
 
                                             }); 
                                             var slotChange = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == s);
@@ -3573,17 +3575,19 @@
                             };
                             Db.Insertable(exTask).ExecuteCommand();
                             logTaskList.Add(exTask);
-
+                            var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, toLocation);
                             outDto1.Add(new OutCommandDto()
                             {
                                 PalletNo = item.PalletNo,//鎵樼洏鍙�
                                 StartLocate = locate.LocatNo, // 璧峰浣嶇疆
-                                StartRoadway = locate.RoadwayNo,//鍏跺疄宸烽亾
-                                EndLocate = toLocation,//outMode, // 鐩爣浣嶇疆 
+                                StartRoadway = locate.RoadwayNo,//璧峰宸烽亾
+                                EndLocate = outMode,//, // 鐩爣浣嶇疆 
+                                EndRoadway = endroad,
                                 TaskNo = exTask.TaskNo, // 浠诲姟鍙�
                                 TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉� 
-                                OutMode = toLocation,  //鍑哄簱鍙� 
+                                OutMode = outMode,  //鍑哄簱鍙� 
                                 Order = Math.Abs(row2 - row1),
+                                Type = PLCTypeEnum.ShuttleCar
 
                             });
                             taskNoStr = exTask.TaskNo;

--
Gitblit v1.8.0