From 8f316cbca92dc248151863320c506f961ed95db8 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 17:18:00 +0800
Subject: [PATCH] 1

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
index 38b8cf7..2debb9b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
@@ -22,12 +22,17 @@
         public WebResponseContent ShelfOutboundCarry(Dt_Task outTask)
         {
             //鍒ゆ柇鏄惁涓虹數鑺簱锛岃緟鏂欏簱浜哄伐澶勭悊(绔嬪簱鐩爣鍦板潃杞崲鎴怉GV绔欑偣鍦板潃)
-            if (!outTask.Roadway.Contains("CP")) return WebResponseContent.Instance.OK();
             Dt_RoadwayInfo dt_RoadwayInfo = _basicService.RoadwayInfoService.Repository.QueryFirst(x => x.OutSCStationCode == outTask.TargetAddress);
-            if (dt_RoadwayInfo == null) return WebResponseContent.Instance.OK();
+            if (dt_RoadwayInfo == null || dt_RoadwayInfo.AreaId == 11) return WebResponseContent.Instance.OK();
             Dt_CachePoint startcachePoint = new Dt_CachePoint();
             Dt_CachePoint cachePoint = GetCachePointByStartPoint(dt_RoadwayInfo.OutStationCode, ref startcachePoint);
-
+            if (startcachePoint.EnableStatus == EnableStatusEnum.Disable.ObjToInt()) return WebResponseContent.Instance.OK();
+            //if (dt_RoadwayInfo.AreaId == 11)//杈呮枡涓嶇敤AGV鎼繍
+            //{
+            //    startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+            //    _basicService.CachePointService.Repository.UpdateData(startcachePoint);
+            //    return WebResponseContent.Instance.OK();
+            //}
             Dt_Task task = new()
             {
                 CurrentAddress = startcachePoint.PointCode,
@@ -46,10 +51,10 @@
                 Creater = App.User.UserId > 0 ? App.User.UserName : "System",
             };
             cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
-            startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+            //startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
 
             _basicService.CachePointService.Repository.UpdateData(cachePoint);
-            _basicService.CachePointService.Repository.UpdateData(startcachePoint);
+            //_basicService.CachePointService.Repository.UpdateData(startcachePoint);
             Repository.AddData(task);
             SendAGVTask(task, cachePoint);
             return WebResponseContent.Instance.OK();
@@ -325,10 +330,10 @@
                                 if (qty > 0) startCachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
                                 startCachePoint.Remark = qty.ToString();
                             }
-                            else if (startCachePoint.AreaId == 1)
-                            {
-                                startCachePoint.PointStatus = LocationStatusEnum.PalletLock.ObjToInt();
-                            }
+                            //else if (startCachePoint.AreaId == 1)
+                            //{
+                            //    startCachePoint.PointStatus = LocationStatusEnum.PalletLock.ObjToInt();
+                            //}
                             _basicService.CachePointService.Repository.UpdateData(startCachePoint);
                         }
                     }

--
Gitblit v1.9.3