From 8435e0ed272921dd2aa9a3a43c7b5343d9072df3 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Wed, 14 Jan 2026 10:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/Material/Dto/MmRecordOutboundDto.cs      |  4 +++-
 DOAN.Service/MES/Material/MmInventoryService.cs  | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
index bca455e..82a3aa9 100644
--- a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
@@ -117,7 +117,9 @@ namespace DOAN.Model.BZFM.Dto
         /// </summary>
         public string Workorder { get; set; }
 
-        // 1-蓝单正向 2-红单逆向
+        /// <summary>
+        /// 1-蓝单正向 2-红单逆向
+        /// </summary>
         public int ReceiptType { get; set; } = 1;
     }
 
diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index da7868f..02126d3 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -327,6 +327,12 @@ namespace DOAN.Service.BZFM
 
                 if (mmInventory == null)
                 {
+                    if (parm.ReceiptType == 1)
+                    {
+                        //库存为0或者不存在，不允许出库
+                        Context.Ado.RollbackTran();
+                        return "库存不存在，禁止出库！";
+                    }
                     var newInventory = new MmInventory()
                     {
                         MaterialCode = mmMaterial.MaterialCode,
@@ -351,7 +357,7 @@ namespace DOAN.Service.BZFM
                     if (mmInventory.CurrentQty - delta < 0)
                     {
                         Context.Ado.RollbackTran();
-                        return "库存不足，无法出库";
+                        return "库存不足，无法出库！";
                     }
                     mmInventory.CurrentQty -= delta;
                     Context
@@ -379,6 +385,7 @@ namespace DOAN.Service.BZFM
                     CreatedTime = nowDate,
                     TransactionType = parm.TransactionType,
                     Workorder = parm.Workorder,
+                    OrderNo = parm.OrderNo,
                     Remarks = parm.Remarks,
                 };
                 Context.Insertable(newRecord).ExecuteCommand();
@@ -420,7 +427,7 @@ namespace DOAN.Service.BZFM
                     var last = Context
                         .Queryable<MmRecordInbound>()
                         .Where(it => it.InboundNo.StartsWith(prefix + datePart))
-                        .OrderBy(it => it.InboundNo + " desc")
+                        .OrderByDescending(it => it.InboundNo)
                         .Select(it => it.InboundNo)
                         .First();
                     if (string.IsNullOrEmpty(last))
@@ -439,7 +446,7 @@ namespace DOAN.Service.BZFM
                     var last = Context
                         .Queryable<MmRecordOutbound>()
                         .Where(it => it.OutboundNo.StartsWith(prefix + datePart))
-                        .OrderBy(it => it.OutboundNo + " desc")
+                        .OrderByDescending(it => it.OutboundNo)
                         .Select(it => it.OutboundNo)
                         .First();
                     if (string.IsNullOrEmpty(last))
@@ -729,6 +736,7 @@ namespace DOAN.Service.BZFM
                         Workorder = it.Workorder,
                         StoveCode = it.StoveCode,
                     })
+                    .OrderByDescending(it => it.CreatedTime)
                     .ToPage(parm);
             }
             // 查询出库记录
@@ -768,7 +776,9 @@ namespace DOAN.Service.BZFM
                         Operator = it.Operator,
                         CreatedTime = it.CreatedTime,
                         Workorder = it.Workorder,
+                        OrderNo = it.OrderNo
                     })
+                    .OrderByDescending(it => it.CreatedTime)
                     .ToPage(parm);
             }