From 5c96c324aec53171cfe3d934a4a42cb14ac38c61 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 28 十一月 2025 11:26:31 +0800
Subject: [PATCH] GetExportNoticeDetailList增加包装isdel=0的筛选

---
 Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
index 3cc19b6..02f4051 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
@@ -18,10 +18,10 @@
 
 namespace WMS.BLL.BllSoServer
 {
-    public class ExportNoticeDetailServer: DbHelper<BllExportNoticeDetail>,IExportNoticeDetailServer
+    public class ExportNoticeDetailServer : DbHelper<BllExportNoticeDetail>, IExportNoticeDetailServer
     {
         private static readonly SqlSugarScope Db = DataContext.Db;
-        public ExportNoticeDetailServer():base(Db)
+        public ExportNoticeDetailServer() : base(Db)
         {
         }
         public async Task<List<ExportNoticeDetailDto>> GetExportNoticeDetailList(GetExportNoticeDetailVm model, RefAsync<int> count)
@@ -37,7 +37,7 @@
             }
 
             var data = await GetAllWhereAsync(a => a.SONo == model.SoNo)
-                .LeftJoin<SysPackag>((a, b) => a.PackagNo == b.PackagNo)
+                .LeftJoin<SysPackag>((a, b) => b.IsDel == "0" && a.PackagNo == b.PackagNo)
                 .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
                 .LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
                 .Select((a, b, c, d) => new ExportNoticeDetailDto()
@@ -78,7 +78,7 @@
         public bool DelExportNoticeDetail(int id, int userId)
         {
             try
-            { 
+            {
                 //鍑哄簱鍗曟槑缁�
                 var noticeDetail = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.Id == id).ToList().FirstOrDefault();
                 //鍑哄簱鍗曟槑缁�                
@@ -86,7 +86,7 @@
 
                 if (noticeDetail == null)
                 {
-                    throw  new Exception("鏈煡璇㈠埌鍑哄簱鍗曟槑缁嗕俊鎭�");
+                    throw new Exception("鏈煡璇㈠埌鍑哄簱鍗曟槑缁嗕俊鎭�");
                 }
                 if (notice == null)
                 {
@@ -134,7 +134,7 @@
 
                         n = Db.Updateable(notice).ExecuteCommand();
                         j = 1;
-                    } 
+                    }
                     var m = Db.Updateable(sd).UpdateColumns(it => new { it.LockQty }).ExecuteCommand();
 
                     var i = Db.Updateable(noticeDetail).ExecuteCommand();
@@ -142,7 +142,7 @@
                     //娣诲姞鎿嶄綔鏃ュ織璁板綍
                     var k = new OperationSOServer().AddLogOperationSo("鍑哄簱浣滀笟", "鍑哄簱鍗曟嵁", notice.SONo, "鍒犻櫎", $"鍒犻櫎浜嗗崟鎹彿涓簕notice.SONo}銆佺墿鏂欎负{noticeDetail.SkuNo}銆佹壒娆″彿涓簕noticeDetail.LotNo}鐨勫崟鎹槑缁嗕俊鎭�", userId);
 
-                    if (j>0)
+                    if (j > 0)
                     {
                         if (n > 0 && m > 0 && i > 0 && k)
                         {
@@ -152,13 +152,13 @@
                     }
                     else
                     {
-                        if ( m > 0 && i > 0 && k)
+                        if (m > 0 && i > 0 && k)
                         {
                             Db.CommitTran();
                             return true;
                         }
                     }
-                    
+
                     Db.RollbackTran();
                     return false;
                 }
@@ -171,7 +171,7 @@
             }
             catch (Exception e)
             {
-                throw new Exception("鍒犻櫎鍑哄簱鍗曟槑缁嗗け璐ワ細"+e.Message);
+                throw new Exception("鍒犻櫎鍑哄簱鍗曟槑缁嗗け璐ワ細" + e.Message);
             }
         }
 

--
Gitblit v1.8.0