From 1b6830d5f8671e48bdc13d7155b848aa938283f5 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周五, 29 11月 2024 15:53:16 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
index 065be5e..a03800a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -5,6 +5,8 @@
using System.Web;
using System.Text;
using System;
+using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
+
namespace Admin.NET.Application;
/// <summary>
/// 搴撳瓨淇℃伅鏈嶅姟
@@ -327,16 +329,17 @@
/// [HttpGet]
[ApiDescriptionSettings(Name = "ShortageList")]
[Description("WmsStockQuan/ShortageList")]
- public async Task<List<WmsShortageListOutput>> ShortageList(KittingListInput input)
+ public async Task<WmsShortageListOutput> ShortageList(KittingListInput input)
{
var listRes = await GetShortageListCore(input);
-
+ var resJson = new WmsShortageListOutput();
if (!string.IsNullOrWhiteSpace(input.UPI))
{
- listRes = listRes.Where(u => u.UPI == input.UPI).ToList();
+ resJson = listRes.FirstOrDefault(u => u.UPI == input.UPI);
+ //var filteredResult = listRes.FirstOrDefault(u => u.UPI == input.UPI);
}
- return listRes;
+ return resJson;
}
/// <summary>
@@ -447,8 +450,18 @@
DetailName = item.DetailName,
OrderId = item.OrderId,
PlanNo = item.PlanNo,
- Info5= item.Info5,
+ Info5 = item.Info5,
+ Info4 = item.Info4,
+ Info10 = item.Info10,
+ Info11 = item.Info11,
+ Info12= item.Info12,
+ Info13 = item.Info13,
+ Info14 = item.Info14,
+ Info15 = item.Info15,
Info16 = item.Info16,
+ Length = item.Length,
+ Width = item.Width,
+ Thk = item.Thk
});
}
}
--
Gitblit v1.9.3