From 3b87f36219202b4cec47840bd9f56fdbe53e7d04 Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期二, 11 三月 2025 20:49:17 +0800
Subject: [PATCH] 初版提交
---
Admin.NET/WCS.Application/Service/WcsBoxInfo/WcsBoxInfoService.cs | 51 +++++++++------------------------------------------
1 files changed, 9 insertions(+), 42 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsBoxInfo/WcsBoxInfoService.cs b/Admin.NET/WCS.Application/Service/WcsBoxInfo/WcsBoxInfoService.cs
index 0f7685b..8016639 100644
--- a/Admin.NET/WCS.Application/Service/WcsBoxInfo/WcsBoxInfoService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsBoxInfo/WcsBoxInfoService.cs
@@ -6,9 +6,7 @@
using Admin.NET.Core.Service;
using Microsoft.AspNetCore.Http;
-using System.Security.AccessControl;
using WCS.Application.Entity;
-using WCS.Application.Service.WcsBoxInfo.Dto;
namespace WCS.Application;
/// <summary>
@@ -44,13 +42,13 @@
|| u.Custom.Contains(input.SearchKey)
|| u.CustomName.Contains(input.SearchKey)
|| u.LineNo.Contains(input.SearchKey)
- || u.Standard.Contains(input.SearchKey)
- || u.PackageStandard.Contains(input.SearchKey)
- || u.PackUnit.Contains(input.SearchKey)
+ || u.InsPectMark.Contains(input.SearchKey)
|| u.BitBoxMark.Contains(input.SearchKey)
|| u.BoxNo.Contains(input.SearchKey)
|| u.BoxNo2.Contains(input.SearchKey)
- || u.Level.Contains(input.SearchKey)
+ || u.BoxNo3.Contains(input.SearchKey)
+ || u.EndLotFlag.Contains(input.SearchKey)
+ || u.Status.Contains(input.SearchKey)
)
.WhereIF(!string.IsNullOrWhiteSpace(input.PalletNo), u => u.PalletNo.Contains(input.PalletNo.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.SkuNo), u => u.SkuNo.Contains(input.SkuNo.Trim()))
@@ -59,17 +57,14 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.LotText), u => u.LotText.Contains(input.LotText.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Custom), u => u.Custom.Contains(input.Custom.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.CustomName), u => u.CustomName.Contains(input.CustomName.Trim()))
- .WhereIF(input.ProductionTimeRange != null && input.ProductionTimeRange.Length == 2, u => u.ProductionTime >= input.ProductionTimeRange[0] && u.ProductionTime <= input.ProductionTimeRange[1])
- .WhereIF(input.ExpirationTimeRange != null && input.ExpirationTimeRange.Length == 2, u => u.ExpirationTime >= input.ExpirationTimeRange[0] && u.ExpirationTime <= input.ExpirationTimeRange[1])
.WhereIF(!string.IsNullOrWhiteSpace(input.LineNo), u => u.LineNo.Contains(input.LineNo.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Standard), u => u.Standard.Contains(input.Standard.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.PackageStandard), u => u.PackageStandard.Contains(input.PackageStandard.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.PackUnit), u => u.PackUnit.Contains(input.PackUnit.Trim()))
- .WhereIF(input.StoreTimeRange != null && input.StoreTimeRange.Length == 2, u => u.StoreTime >= input.StoreTimeRange[0] && u.StoreTime <= input.StoreTimeRange[1])
+ .WhereIF(!string.IsNullOrWhiteSpace(input.InsPectMark), u => u.InsPectMark.Contains(input.InsPectMark.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.BitBoxMark), u => u.BitBoxMark.Contains(input.BitBoxMark.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.BoxNo), u => u.BoxNo.Contains(input.BoxNo.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.BoxNo2), u => u.BoxNo2.Contains(input.BoxNo2.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Level), u => u.Level.Contains(input.Level.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.BoxNo3), u => u.BoxNo3.Contains(input.BoxNo3.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.EndLotFlag), u => u.EndLotFlag.Contains(input.EndLotFlag.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Status), u => u.Status.Contains(input.Status.Trim()))
.Select<WcsBoxInfoOutput>();
return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
@@ -146,34 +141,6 @@
- /// <summary>
- /// 鑾峰彇绠辩爜鏄庣粏琛ㄥ垪琛�
- /// </summary>
- /// <returns></returns>
- [HttpGet]
- [ApiDescriptionSettings(Name = "GroupSkuList")]
- [DisplayName("鑾峰彇鍒嗙粍绠辩爜淇℃伅")]
- public async Task<List<WcsGroupBoxInfoDto>> GroupSkuList()
- {
- return await _wcsBoxInfoRep.AsQueryable()
- .Select<WcsBoxInfo>()
- .GroupBy(m => new { m.SkuNo, m.SkuName, m.LotNo, m.LotText, m.Custom, m.CustomName, m.ProductionTime, m.ExpirationTime, m.Standard, m.PackageStandard, m.PackUnit, m.StoreTime })
- .Select(a => new WcsGroupBoxInfoDto()
- {
- SkuNo = a.SkuNo,
- SkuName = a.SkuName,
- LotNo = a.LotNo,
- LotText = a.LotText,
- Custom = a.Custom,
- CustomName = a.CustomName,
- ProductionTime = a.ProductionTime,
- ExpirationTime = a.ExpirationTime,
- Standard = a.Standard,
- PackageStandard = a.PackageStandard,
- PackUnit = a.PackUnit,
- StoreTime = a.StoreTime
- })
- .ToListAsync();
- }
+
}
--
Gitblit v1.8.0