From 58bd958f1fa8a85d0a3ac33a1ab1e2cab5d63dd2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 20 六月 2024 20:18:46 +0800
Subject: [PATCH] 按照SN号查询最新的工单

---
 代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs"
index 8c7b8b2..27b7e4c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs"
@@ -11,7 +11,7 @@
 using WIDESEA_WMS.IRepositories;
 using WIDESEA_WMS.Repositories;
 
-namespace WIDESEA_WCS.JobsPart.Common
+namespace WIDESEA_WMS.Common
 {
     public class EmptyTray
     {
@@ -38,7 +38,7 @@
         /// <summary>
         /// 鑾峰彇鍙叆绌烘墭璐т綅
         /// </summary>
-        public static dt_stationinfo GetEmptyTrayStation(Idt_stationinfoRepository stationinfoRepository,dt_agvtask agv_task)
+        public static dt_stationinfo GetEmptyTrayStation(Idt_stationinfoRepository stationinfoRepository, dt_agvtask agv_task)
         {
             dt_stationinfo EmptyStation = null;
             #region 妫�娴嬩笂鏂欑殑绌烘墭鍙犵洏
@@ -80,7 +80,7 @@
                     #region 鍚屼竴涓┖鎵樹綅鍙兘鍚屾椂鐢熸垚涓�涓┖鎵樹换鍔�
                     if (agvtaskRepository.Find(x => x.agv_fromaddress == toEmptyStation.stationCode || x.agv_toaddress == toEmptyStation.stationCode).Any()) return;
                     #endregion
-
+                    var quantity = 5 - toEmptyStation.quantity;
                     dt_agvtask agvtask = new dt_agvtask()
                     {
                         agv_fromaddress = EmptyStation.stationCode,
@@ -89,9 +89,9 @@
                         agv_grade = 3,
                         agv_createtime = DateTime.Now,
                         agv_taskstate = "Create",
-                        //agv_materielid = station.stationType,
-                        agv_qty = EmptyStation.quantity - toEmptyStation.quantity,
-                        StarQuantity = toEmptyStation.quantity,
+                        agv_qty = EmptyStation.quantity <= quantity ? EmptyStation.quantity : quantity,
+                        //agv_qty = EmptyStation.quantity - toEmptyStation.quantity,
+                        StarQuantity = EmptyStation.quantity <= quantity ? 0 : EmptyStation.quantity - quantity,
                         EndQuantity = toEmptyStation.quantity,
                         agv_tasktype = "TaskType_EmptyPallet",
                         agv_toaddress = toEmptyStation.stationCode,
@@ -103,6 +103,7 @@
                     EmptyStation.location_state = LocationStateEnum.Busy.ToString();
                     stationinfoRepository.Update(EmptyStation, true);
                     toEmptyStation.location_state = LocationStateEnum.Busy.ToString();
+                    toEmptyStation.tray_status = TrayStateEnum.EmptyTray.ToString();
                     stationinfoRepository.Update(toEmptyStation, true);
                     WriteDBLog.Success("鍒涘缓鍙犵洏浣嶇┖鎵樺叆搴撲换鍔�", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
                 }

--
Gitblit v1.9.3