出库与库存查询接口及DTO结构优化
- 出库记录表查询接口由 GET 改为 POST,支持更复杂参数 - 新增出库记录接口参数由 FromBody 改为 FromQuery - MmInventoryDto 增加 BatchNo 字段,支持按批次号查询 - MmRecordOutboundDto 的 CreatedTime 改为时间区间数组 - 服务层查询逻辑支持批次号和时间区间查询 - 优化 using 引用顺序,提升代码可维护性
This commit is contained in:
@@ -76,6 +76,7 @@ namespace DOAN.Service.BZFM
|
||||
.AndIF(!string.IsNullOrEmpty(parm.WarehouseCode), m => m.WarehouseCode.Contains(parm.WarehouseCode))
|
||||
.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), m => m.MaterialCode.Contains(parm.MaterialCode))
|
||||
.AndIF(!string.IsNullOrEmpty(parm.WarehouseName), m => m.WarehouseName.Contains(parm.WarehouseName))
|
||||
.AndIF(!string.IsNullOrEmpty(parm.BatchNo), m => m.BatchNo.Contains(parm.BatchNo))
|
||||
;
|
||||
|
||||
return predicate;
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Extensions;
|
||||
using DOAN.Model.BZFM.Dto;
|
||||
using DOAN.Model.BZFM;
|
||||
using DOAN.Model.BZFM.Dto;
|
||||
using DOAN.Repository;
|
||||
using DOAN.Service.BZFM.IBZFMService;
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Converter;
|
||||
using Infrastructure.Extensions;
|
||||
|
||||
namespace DOAN.Service.BZFM
|
||||
{
|
||||
@@ -71,12 +72,26 @@ namespace DOAN.Service.BZFM
|
||||
/// <returns></returns>
|
||||
private static Expressionable<MmRecordOutbound> QueryExp(MmRecordOutboundQueryDto parm)
|
||||
{
|
||||
if (parm.CreatedTime != null && parm.CreatedTime.Length > 0)
|
||||
{
|
||||
parm.CreatedTime[0] = DOANConvertDate.ConvertLocalDate(parm.CreatedTime[0]);
|
||||
parm.CreatedTime[1] = DOANConvertDate.ConvertLocalDate(parm.CreatedTime[1]);
|
||||
parm.CreatedTime[0] = parm.CreatedTime[0].Date;
|
||||
parm.CreatedTime[1] = parm.CreatedTime[1].Date;
|
||||
}
|
||||
var predicate = Expressionable.Create<MmRecordOutbound>()
|
||||
.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode))
|
||||
.AndIF(!string.IsNullOrEmpty(parm.OutboundNo), it => it.OutboundNo.Contains(parm.OutboundNo))
|
||||
.AndIF(!string.IsNullOrEmpty(parm.TransactionType), it => it.TransactionType.Contains(parm.TransactionType))
|
||||
.AndIF(parm.CreatedTime > DateTime.MinValue, it => it.CreatedTime < parm.CreatedTime)
|
||||
;
|
||||
.AndIF(
|
||||
parm.CreatedTime != null && parm.CreatedTime[0] > DateTime.MinValue,
|
||||
it => it.CreatedTime >= parm.CreatedTime[0]
|
||||
)
|
||||
.AndIF(
|
||||
parm.CreatedTime != null && parm.CreatedTime[1] > DateTime.MinValue,
|
||||
it => it.CreatedTime <= parm.CreatedTime[1]
|
||||
);
|
||||
;
|
||||
|
||||
return predicate;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user