Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
qianhao.xu
2024-04-15 12:45:50 +08:00
parent 0f4ea6c5ba
commit f5d04d7cd6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
View File

@@ -37,6 +37,7 @@
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" /> <PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.7" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.7" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <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" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" /> <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />

4
ZR.Service/mes/wms/WmOutOrderService.cs
View File

@@ -451,7 +451,7 @@ namespace ZR.Service.mes.wms
string short_patch = item.Split("_")[0]; string short_patch = item.Split("_")[0];
WmOutOrderPlan plan_item = Context.Queryable<WmOutOrderPlan>() WmOutOrderPlan plan_item = Context.Queryable<WmOutOrderPlan>()
.Where(it => it.FkOutOrderId == shipnumber) .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) if (plan_item != null)
{ {
var plan_earliest = Context.Queryable<WmOutOrderPlan>() var plan_earliest = Context.Queryable<WmOutOrderPlan>()
@@ -465,7 +465,7 @@ namespace ZR.Service.mes.wms
{ {
return (100, 100); return (100, 100);
} }
if (plan_earliest.Id == plan_earliest.Id) if (plan_earliest.Id == plan_item.Id)
{ {
// TODO 每次出库要出库计划累加 // TODO 每次出库要出库计划累加