From 6b0ca94550ba7418abc1b24d985eff556bf6fa6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 14 May 2024 10:31:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Service/mes/wms/WmOutOrderService.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs
index a71c1637..48e48079 100644
--- a/ZR.Service/mes/wms/WmOutOrderService.cs
+++ b/ZR.Service/mes/wms/WmOutOrderService.cs
@@ -53,7 +53,7 @@ namespace ZR.Service.mes.wms
                 ;
             var response = Queryable()
                 .Where(predicate.ToExpression())
-                .OrderByDescending(it=>it.CreatedTime)
+                .OrderByDescending(it => it.CreatedTime)
                 .ToPage<WmOutOrder, WmOutOrderDto>(parm);
 
             return response;
@@ -683,14 +683,14 @@ namespace ZR.Service.mes.wms
                 // 3.2 判断是否是计划中的物料(大概率不执行)
                 bool flag1 = false;
                 List<WmMaterial> materialOutorders = Context.Queryable<WmMaterialOutorder>()
-                    .LeftJoin<WmMaterial>((wmo,wm)=>wmo.FkMaterialId == wm.Id)
+                    .LeftJoin<WmMaterial>((wmo, wm) => wmo.FkMaterialId == wm.Id)
                     .Where(wmo => wmo.FkOutorderId == shipment_num)
                     .Select((wmo, wm) => new WmMaterial
                     {
                         Partnumber = wm.Partnumber
                     })
                     .ToList();
-                foreach(WmMaterial materialOption in materialOutorders)
+                foreach (WmMaterial materialOption in materialOutorders)
                 {
                     if (materialOption.Partnumber == resultionPackage.PartNumner)
                     {
@@ -819,6 +819,7 @@ namespace ZR.Service.mes.wms
                 // 2.此出库单下的批次号的已出库记录
                 var exp2 = Expressionable.Create<WmGoodsOutRecord>()
                 .And(it => it.PackageCodeClient.Contains(plan.Patchcode))
+                .And(it => it.Partnumber == plan.MaterialCode)
                 .And(it => it.FkOutOrderId == shipment_num)
                 .ToExpression();
                 List<WmGoodsOutRecord> outPackageList = Context.Queryable<WmGoodsOutRecord>()
@@ -837,6 +838,7 @@ namespace ZR.Service.mes.wms
                     // 此批次是否还有库存
                     bool hasAny = Context.Queryable<WmGoodsNowProduction>()
                            .Where(it => it.PackageCodeClient.Contains(plan.Patchcode))
+                           .Where(it => it.Partnumber == plan.MaterialCode)
                            .Any();
                     // 检查此批次是否出完
                     if (outPartnumberNum >= plan.RequireNum || !hasAny)