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/BllPdaServer/PdaSoServer.cs |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 512b2d9..3b9a7d0 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1797,21 +1797,22 @@
                 foreach (var s in stockDetail)
                 {
                     //鑾峰彇鍌ㄤ綅淇℃伅
-                    var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W01");
+                    var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");
 
-                    if (locat != null)
+                    if (locat == null)
                     {
-                        if (locat.Status != "1")
-                        {
-                            continue;
-                        }
-                        //鏇存敼鍌ㄤ綅鐘舵�佷负鍑哄簱涓�
-                        locat.Status = "3"; //3 鍑哄簱涓�
-                        locat.UpdateTime = serverTime; //淇敼鏃堕棿
-                        locat.UpdateUser = userId; //淇敼浜�
-                        //淇敼鍌ㄤ綅淇℃伅
-                        await Db.Updateable(locat).ExecuteCommandAsync();
+                        throw new Exception("鍌ㄤ綅涓婃病鏈夌┖鎵樼洏璺�");
                     }
+                    if (locat.Status != "1")
+                    {
+                        continue;
+                    }
+                    //鏇存敼鍌ㄤ綅鐘舵�佷负鍑哄簱涓�
+                    locat.Status = "3"; //3 鍑哄簱涓�
+                    locat.UpdateTime = serverTime; //淇敼鏃堕棿
+                    locat.UpdateUser = userId; //淇敼浜�
+                                               //淇敼鍌ㄤ綅淇℃伅
+                    await Db.Updateable(locat).ExecuteCommandAsync();
 
                     //澧炲姞搴撳瓨閿佸畾鏁伴噺
                     //stock.AllotQty +=
@@ -1897,7 +1898,8 @@
                         TaskNo = exTask.TaskNo, // 浠诲姟鍙�
                         TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)
                         OutMode = model.OutMode,  //鐩爣鍦板潃
-                        Order = 1
+                        Order = 1,
+                        Type = PLCTypeEnum.AGV
                     });
                     await Db.Insertable(exTask).ExecuteCommandAsync();
 
@@ -1952,13 +1954,13 @@
                 var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "绌烘墭鍑哄簱", i + "", "涓嬪彂", $"鐢≒DA涓嬪彂浜� {i} 涓┖鎵樺灈", userId);
                 Db.CommitTran();
 
-                return "";
+                return "鎴愬姛";
 
             }
             catch (Exception e)
             {
                 Db.RollbackTran();
-                return "";
+                return e.Message;
             }
 
         }

--
Gitblit v1.8.0