From 0a4fdc2b4d0f5fb7d16fbd0182bef305105e3eae Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 18:44:36 +0800
Subject: [PATCH] 调整库位实体 新增容器 容器类型实体
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/MaterialSortingService.cs | 394 ++++++++++++++++++++++++++++----------------------------
1 files changed, 197 insertions(+), 197 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/MaterialSortingService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/MaterialSortingService.cs
index 2cf5aa4..8f86fb2 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/MaterialSortingService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/MaterialSortingService.cs
@@ -1,216 +1,216 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using Admin.NET.Core;
-using Yitter.IdGenerator;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+锘�//using Furion.DatabaseAccessor;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Furion.FriendlyException;
+//using Mapster;
+//using Microsoft.AspNetCore.Authorization;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using System.Linq.Dynamic.Core;
+//using Admin.NET.Core;
+//using Yitter.IdGenerator;
+//using Microsoft.Extensions.Logging;
+//using Microsoft.AspNetCore.Mvc.RazorPages;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鐗╂枡鍒嗘嫞鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("Pda鍒嗘嫞", Name = "MaterialSorting", Order = 100)]
- [Route("api/[Controller]")]
- public class MaterialSortingService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
- private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
- private readonly IRepository<WmsSortOrder, MasterDbContextLocator> _wmsSortOrderRep;
- private readonly IRepository<WmsTakeMaterialOrder, MasterDbContextLocator> _wmsTakeMaterialOrderRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// 鐗╂枡鍒嗘嫞鏈嶅姟
+// /// </summary>
+// [ApiDescriptionSettings("Pda鍒嗘嫞", Name = "MaterialSorting", Order = 100)]
+// [Route("api/[Controller]")]
+// public class MaterialSortingService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
+// private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
+// private readonly IRepository<WmsSortOrder, MasterDbContextLocator> _wmsSortOrderRep;
+// private readonly IRepository<WmsTakeMaterialOrder, MasterDbContextLocator> _wmsTakeMaterialOrderRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public MaterialSortingService(
- IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
- IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep,
- IRepository<WmsSortOrder, MasterDbContextLocator> wmsSortOrderRep,
- IRepository<WmsTakeMaterialOrder, MasterDbContextLocator> wmsTakeMaterialOrderRep
- )
- {
- _wmsOrderRep = wmsOrderRep;
- _wmsOrderDetailsRep = wmsOrderDetailsRep;
- _wmsTaskRep = wmsTaskRep;
- _wmsPlaceRep = wmsPlaceRep;
- _wmsAreaRep = wmsAreaRep;
- _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
- _wmsMaterialContainerRep = wmsMaterialContainerRep;
- _wmsContainerRep = wmsContainerRep;
- _wmsContainerPlaceRep = wmsContainerPlaceRep;
- _wmsMaterialStockRep = wmsMaterialStockRep;
- _wmsOrderTypeRep = wmsOrderTypeRep;
- _wmsSortOrderRep = wmsSortOrderRep;
- _wmsTakeMaterialOrderRep = wmsTakeMaterialOrderRep;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public MaterialSortingService(
+// IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
+// IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
+// IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep,
+// IRepository<WmsSortOrder, MasterDbContextLocator> wmsSortOrderRep,
+// IRepository<WmsTakeMaterialOrder, MasterDbContextLocator> wmsTakeMaterialOrderRep
+// )
+// {
+// _wmsOrderRep = wmsOrderRep;
+// _wmsOrderDetailsRep = wmsOrderDetailsRep;
+// _wmsTaskRep = wmsTaskRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// _wmsAreaRep = wmsAreaRep;
+// _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
+// _wmsMaterialContainerRep = wmsMaterialContainerRep;
+// _wmsContainerRep = wmsContainerRep;
+// _wmsContainerPlaceRep = wmsContainerPlaceRep;
+// _wmsMaterialStockRep = wmsMaterialStockRep;
+// _wmsOrderTypeRep = wmsOrderTypeRep;
+// _wmsSortOrderRep = wmsSortOrderRep;
+// _wmsTakeMaterialOrderRep = wmsTakeMaterialOrderRep;
+// }
- /// <summary>
- /// 鎵弿鍒嗘嫞鎵樼洏
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("GetSortInfo")]
- public async Task<GetSortInfoOutput> GetSortInfo([FromQuery] GetSortInfoInput input)
- {
- //妫�鏌ユ墭鐩�
- var wareContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == input.ContainerCode);
- if (wareContainer == null) throw Oops.Oh("瀹瑰櫒淇℃伅涓嶅瓨鍦�!");
- if (wareContainer.ContainerStatus == ContainerStatus.JINYONG) throw Oops.Oh("瀹瑰櫒宸茬鐢�!");
- if (wareContainer.ContainerStatus == ContainerStatus.KUWEI) throw Oops.Oh("瀹瑰櫒鍦ㄥ簱浣嶄笉鍙娇鐢�!");
- if (wareContainer.ContainerStatus != ContainerStatus.FENJIAN) throw Oops.Oh("瀹瑰櫒涓嶅瓨鍦ㄥ垎鎷ｄ俊鎭�!");
+// /// <summary>
+// /// 鎵弿鍒嗘嫞鎵樼洏
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("GetSortInfo")]
+// public async Task<GetSortInfoOutput> GetSortInfo([FromQuery] GetSortInfoInput input)
+// {
+// //妫�鏌ユ墭鐩�
+// var wareContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == input.ContainerCode);
+// if (wareContainer == null) throw Oops.Oh("瀹瑰櫒淇℃伅涓嶅瓨鍦�!");
+// if (wareContainer.ContainerStatus == ContainerStatus.JINYONG) throw Oops.Oh("瀹瑰櫒宸茬鐢�!");
+// if (wareContainer.ContainerStatus == ContainerStatus.KUWEI) throw Oops.Oh("瀹瑰櫒鍦ㄥ簱浣嶄笉鍙娇鐢�!");
+// if (wareContainer.ContainerStatus != ContainerStatus.FENJIAN) throw Oops.Oh("瀹瑰櫒涓嶅瓨鍦ㄥ垎鎷ｄ俊鎭�!");
- //鍒ゆ柇鏄惁鍦ㄤ换鍔′腑
- var isExit = await _wmsTaskRep.AnyAsync(n => n.TaskStatus != TaskStatusEnum.WANCHENG && n.ContainerCode == input.ContainerCode);
- if (isExit) throw Oops.Oh("瀹瑰櫒瀛樺湪鏈畬鎴愪换鍔�!");
+// //鍒ゆ柇鏄惁鍦ㄤ换鍔′腑
+// var isExit = await _wmsTaskRep.AnyAsync(n => n.TaskStatus != TaskStatusEnum.WANCHENG && n.ContainerCode == input.ContainerCode);
+// if (isExit) throw Oops.Oh("瀹瑰櫒瀛樺湪鏈畬鎴愪换鍔�!");
- // 鏌ヨ鍒嗘嫞璁板綍
- var wareSortOrderList = await _wmsSortOrderRep.DetachedEntities
- .Where(p => p.ContainerCode == input.ContainerCode && p.SortStatus != SortStatusEnum.FENJIANWANCHENG).ToListAsync();
+// // 鏌ヨ鍒嗘嫞璁板綍
+// var wareSortOrderList = await _wmsSortOrderRep.DetachedEntities
+// .Where(p => p.ContainerCode == input.ContainerCode && p.SortStatus != SortStatusEnum.FENJIANWANCHENG).ToListAsync();
- return new GetSortInfoOutput
- {
- WmsContainer = wareContainer.Adapt<WmsContainerDto>(),
- WmsSortOrderList = wareSortOrderList
- };
- }
+// return new GetSortInfoOutput
+// {
+// WmsContainer = wareContainer.Adapt<WmsContainerDto>(),
+// WmsSortOrderList = wareSortOrderList
+// };
+// }
- /// <summary>
- /// 鍒嗘嫞纭
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("SortSure")]
- [UnitOfWork]
- public async Task SortSure(GetSortInfoOutput input)
- {
- if (input.WmsContainer == null || input.WmsSortOrderList.Count == 0) throw Oops.Oh("浼犻�掑弬鏁板紓甯�!");
+// /// <summary>
+// /// 鍒嗘嫞纭
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("SortSure")]
+// [UnitOfWork]
+// public async Task SortSure(GetSortInfoOutput input)
+// {
+// if (input.WmsContainer == null || input.WmsSortOrderList.Count == 0) throw Oops.Oh("浼犻�掑弬鏁板紓甯�!");
- //妫�鏌ユ墭鐩�
- var wareContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == input.WmsContainer.ContainerCode);
- if (wareContainer == null) throw Oops.Oh("瀹瑰櫒淇℃伅涓嶅瓨鍦�!");
- if (wareContainer.ContainerStatus == ContainerStatus.JINYONG) throw Oops.Oh("瀹瑰櫒宸茬鐢�!");
- if (wareContainer.ContainerStatus == ContainerStatus.KUWEI) throw Oops.Oh("瀹瑰櫒鍦ㄥ簱浣嶄笉鍙娇鐢�!");
- if (wareContainer.ContainerStatus != ContainerStatus.FENJIAN) throw Oops.Oh("瀹瑰櫒涓嶅瓨鍦ㄥ垎鎷ｄ俊鎭�!");
+// //妫�鏌ユ墭鐩�
+// var wareContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == input.WmsContainer.ContainerCode);
+// if (wareContainer == null) throw Oops.Oh("瀹瑰櫒淇℃伅涓嶅瓨鍦�!");
+// if (wareContainer.ContainerStatus == ContainerStatus.JINYONG) throw Oops.Oh("瀹瑰櫒宸茬鐢�!");
+// if (wareContainer.ContainerStatus == ContainerStatus.KUWEI) throw Oops.Oh("瀹瑰櫒鍦ㄥ簱浣嶄笉鍙娇鐢�!");
+// if (wareContainer.ContainerStatus != ContainerStatus.FENJIAN) throw Oops.Oh("瀹瑰櫒涓嶅瓨鍦ㄥ垎鎷ｄ俊鎭�!");
- var wmsMaterialContainers = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == input.WmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- foreach (var item in input.WmsSortOrderList)
- {
- var wmsMaterialContainerModel = wmsMaterialContainers.FirstOrDefault(p => p.MaterialNo == item.Materialcode);
- if (wmsMaterialContainerModel != null)
- {
- if (wmsMaterialContainerModel.BindQuantity < item.ActualQuantity) throw Oops.Oh("鍒嗘嫞缁勭洏寮傚父!");
- wmsMaterialContainerModel.BindQuantity -= item.ActualQuantity;
- if (wmsMaterialContainerModel.BindQuantity <= 0)
- {
- wmsMaterialContainers.Remove(wmsMaterialContainerModel);
- await _wmsMaterialContainerRep.DeleteAsync(wmsMaterialContainerModel);
- }
- else
- {
- await _wmsMaterialContainerRep.UpdateAsync(wmsMaterialContainerModel);
- }
- }
- var stockModel = await _wmsMaterialStockRep.FirstOrDefaultAsync(p => p.ContainerCode == wareContainer.ContainerCode && p.MaterialNo == item.Materialcode);
- if (stockModel != null)
- {
- if (stockModel.StockNumber < item.ActualQuantity) throw Oops.Oh("鍒嗘嫞搴撳瓨寮傚父!");
- stockModel.StockNumber -= item.ActualQuantity;
- if (stockModel.StockNumber <= 0) await _wmsMaterialStockRep.DeleteAsync(stockModel);
- else await _wmsMaterialStockRep.UpdateAsync(stockModel);
- }
+// var wmsMaterialContainers = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == input.WmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// foreach (var item in input.WmsSortOrderList)
+// {
+// var wmsMaterialContainerModel = wmsMaterialContainers.FirstOrDefault(p => p.MaterialNo == item.Materialcode);
+// if (wmsMaterialContainerModel != null)
+// {
+// if (wmsMaterialContainerModel.BindQuantity < item.ActualQuantity) throw Oops.Oh("鍒嗘嫞缁勭洏寮傚父!");
+// wmsMaterialContainerModel.BindQuantity -= item.ActualQuantity;
+// if (wmsMaterialContainerModel.BindQuantity <= 0)
+// {
+// wmsMaterialContainers.Remove(wmsMaterialContainerModel);
+// await _wmsMaterialContainerRep.DeleteAsync(wmsMaterialContainerModel);
+// }
+// else
+// {
+// await _wmsMaterialContainerRep.UpdateAsync(wmsMaterialContainerModel);
+// }
+// }
+// var stockModel = await _wmsMaterialStockRep.FirstOrDefaultAsync(p => p.ContainerCode == wareContainer.ContainerCode && p.MaterialNo == item.Materialcode);
+// if (stockModel != null)
+// {
+// if (stockModel.StockNumber < item.ActualQuantity) throw Oops.Oh("鍒嗘嫞搴撳瓨寮傚父!");
+// stockModel.StockNumber -= item.ActualQuantity;
+// if (stockModel.StockNumber <= 0) await _wmsMaterialStockRep.DeleteAsync(stockModel);
+// else await _wmsMaterialStockRep.UpdateAsync(stockModel);
+// }
- // 杩欓噷杩橀渶瑕佹牴鎹疄闄呬笅鍙戞暟鏉ユ洿鏂板垎鎷ｇ姸鎬�
- var wareSortOrderModel = await _wmsSortOrderRep.FirstOrDefaultAsync(p => p.ContainerCode == wareContainer.ContainerCode
- && p.SortStatus != SortStatusEnum.FENJIANWANCHENG && p.Materialcode == item.Materialcode);
+// // 杩欓噷杩橀渶瑕佹牴鎹疄闄呬笅鍙戞暟鏉ユ洿鏂板垎鎷ｇ姸鎬�
+// var wareSortOrderModel = await _wmsSortOrderRep.FirstOrDefaultAsync(p => p.ContainerCode == wareContainer.ContainerCode
+// && p.SortStatus != SortStatusEnum.FENJIANWANCHENG && p.Materialcode == item.Materialcode);
- if (wareSortOrderModel != null)
- {
- wareSortOrderModel.ActualQuantity += item.ActualQuantity;
+// if (wareSortOrderModel != null)
+// {
+// wareSortOrderModel.ActualQuantity += item.ActualQuantity;
- if (wareSortOrderModel.ActualQuantity >= wareSortOrderModel.SortQuantity)
- {
- wareSortOrderModel.SortStatus = SortStatusEnum.FENJIANWANCHENG;
- _wmsSortOrderRep.UpdateNow(wareSortOrderModel);
+// if (wareSortOrderModel.ActualQuantity >= wareSortOrderModel.SortQuantity)
+// {
+// wareSortOrderModel.SortStatus = SortStatusEnum.FENJIANWANCHENG;
+// _wmsSortOrderRep.UpdateNow(wareSortOrderModel);
- // 鍒嗘嫞鍗曞畬鎴愬悗鍒ゆ柇鍑哄簱鏄庣粏鏄惁瀹屾垚
- }
- else
- {
- wareSortOrderModel.SortStatus = SortStatusEnum.FENJIANZHONG;
- _wmsSortOrderRep.UpdateNow(wareSortOrderModel);
- }
- }
- }
+// // 鍒嗘嫞鍗曞畬鎴愬悗鍒ゆ柇鍑哄簱鏄庣粏鏄惁瀹屾垚
+// }
+// else
+// {
+// wareSortOrderModel.SortStatus = SortStatusEnum.FENJIANZHONG;
+// _wmsSortOrderRep.UpdateNow(wareSortOrderModel);
+// }
+// }
+// }
- var wareSortOrderCount = await _wmsSortOrderRep
- .Where(p => p.ContainerCode == input.WmsContainer.ContainerCode && p.SortStatus != SortStatusEnum.FENJIANWANCHENG).CountAsync();
+// var wareSortOrderCount = await _wmsSortOrderRep
+// .Where(p => p.ContainerCode == input.WmsContainer.ContainerCode && p.SortStatus != SortStatusEnum.FENJIANWANCHENG).CountAsync();
- //鏇存柊鎵樼洏鐘舵�侊紝鍒嗘嫞瀹屾垚
- if (wareSortOrderCount == 0)
- {
- if (wmsMaterialContainers.Count == 0) wareContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- else wareContainer.ContainerStatus = ContainerStatus.ZUPANG;
- // 鏇存柊瀹瑰櫒鐘舵��
- await _wmsContainerRep.UpdateAsync(wareContainer);
- }
- }
+// //鏇存柊鎵樼洏鐘舵�侊紝鍒嗘嫞瀹屾垚
+// if (wareSortOrderCount == 0)
+// {
+// if (wmsMaterialContainers.Count == 0) wareContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// else wareContainer.ContainerStatus = ContainerStatus.ZUPANG;
+// // 鏇存柊瀹瑰櫒鐘舵��
+// await _wmsContainerRep.UpdateAsync(wareContainer);
+// }
+// }
- /// <summary>
- /// pda鍑哄簱鍗曟煡璇�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("SortPdaPage")]
- public async Task<PageResult<SortPdaPageOutput>> SortPdaPage([FromQuery] SortPdaPageInput input)
- {
- var wmsTakeMaterialOrder = await _wmsTakeMaterialOrderRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(input.No), u => EF.Functions.Like(u.NO, $"%{input.No.Trim()}%"))
- .ProjectToType<SortPdaPageOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsTakeMaterialOrder;
- }
+// /// <summary>
+// /// pda鍑哄簱鍗曟煡璇�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("SortPdaPage")]
+// public async Task<PageResult<SortPdaPageOutput>> SortPdaPage([FromQuery] SortPdaPageInput input)
+// {
+// var wmsTakeMaterialOrder = await _wmsTakeMaterialOrderRep.DetachedEntities
+// .Where(!string.IsNullOrEmpty(input.No), u => EF.Functions.Like(u.NO, $"%{input.No.Trim()}%"))
+// .ProjectToType<SortPdaPageOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return wmsTakeMaterialOrder;
+// }
- /// <summary>
- /// pda鏍规嵁鍑哄簱鍗曡幏鍙栧垎鎷ｅ崟鏄庣粏
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("SortPdaDetailPage")]
- public async Task<PageResult<SortPdaDetailPageOutput>> SortPdaDetailPage([FromQuery] SortPdaDetailPageInput input)
- {
- var wmsTakeMaterialOrder = await _wmsSortOrderRep.DetachedEntities
- .Where(x=>x.OrderNo ==input.No)
- .ProjectToType<SortPdaDetailPageOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsTakeMaterialOrder;
- }
- }
-}
+// /// <summary>
+// /// pda鏍规嵁鍑哄簱鍗曡幏鍙栧垎鎷ｅ崟鏄庣粏
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("SortPdaDetailPage")]
+// public async Task<PageResult<SortPdaDetailPageOutput>> SortPdaDetailPage([FromQuery] SortPdaDetailPageInput input)
+// {
+// var wmsTakeMaterialOrder = await _wmsSortOrderRep.DetachedEntities
+// .Where(x=>x.OrderNo ==input.No)
+// .ProjectToType<SortPdaDetailPageOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return wmsTakeMaterialOrder;
+// }
+// }
+//}
--
Gitblit v1.9.3