From f5d04d7cd68841598538ff9a68ff67c5fd5d12f2 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 15 Apr 2024 12:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/ZR.Admin.WebApi.csproj  | 1 +
 ZR.Service/mes/wms/WmOutOrderService.cs | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
index 986c743b..749a6506 100644
--- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
+++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
@@ -37,6 +37,7 @@
 		<PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.7" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NPOI" Version="2.7.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs
index 3f7df174..29d953a0 100644
--- a/ZR.Service/mes/wms/WmOutOrderService.cs
+++ b/ZR.Service/mes/wms/WmOutOrderService.cs
@@ -451,7 +451,7 @@ namespace ZR.Service.mes.wms
                     string short_patch = item.Split("_")[0];
                     WmOutOrderPlan plan_item = Context.Queryable<WmOutOrderPlan>()
                         .Where(it => it.FkOutOrderId == shipnumber)
-                          .Where(it => it.Patchcode.Contains(short_patch)).First();
+                          .Where(it => it.Patchcode==short_patch).OrderBy(it => it.Outorder).First();
                     if (plan_item != null)
                     {
                         var plan_earliest = Context.Queryable<WmOutOrderPlan>()
@@ -465,7 +465,7 @@ namespace ZR.Service.mes.wms
                         {
                             return (100, 100);
                         }
-                        if (plan_earliest.Id == plan_earliest.Id)
+                        if (plan_earliest.Id == plan_item.Id)
                         {
 
                             // TODO  每次出库要出库计划累加