From 01030b05f7ea9b14878102718a2004b4f908dcfc Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期三, 28 五月 2025 11:15:12 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" index b38e66e..3005140 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Reflection.Metadata; using System.Text; using System.Threading.Tasks; @@ -119,5 +120,54 @@ } return (true, "鎴愬姛", inboundOrderAddDTO); } + + public WebResponseContent GetInboundOrder(InboundOrderGetDTO inboundOrderGetDTO) + { + WebResponseContent content = new WebResponseContent(); + try + { + Expression<Func<Dt_InboundOrder, bool>> expressionOrder = x => true; + if (!string.IsNullOrEmpty(inboundOrderGetDTO.OrderNo)) + { + expressionOrder = x => x.OrderNo.Contains(inboundOrderGetDTO.OrderNo); + } + int count = BaseDal.QueryData(x => x.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt()).ToList().Count(); + int maxPage = Convert.ToInt32(Math.Ceiling(count / 10.0)); + if (inboundOrderGetDTO.pageNo <= maxPage) + { + var inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(expressionOrder).OrderByDescending(x => x.CreateDate).Skip((inboundOrderGetDTO.pageNo - 1) * 10).Take(10).Select(x => new Dt_InboundOrder { OrderNo = x.OrderNo, Id = x.Id, CreateDate = x.CreateDate,Creater=x.Creater }).ToList(); + + content = WebResponseContent.Instance.OK(data: inboundOrder); + } + else + { + content = WebResponseContent.Instance.OK(data: null, message: "宸插埌鏈�鍚庝竴椤�"); + } + } + catch (Exception ex) + { + content = WebResponseContent.Instance.Error($"鏌ヨ鍏ュ簱鍗曟嵁閿欒,閿欒淇℃伅:{ex.Message}"); + } + + return content; + } + + public WebResponseContent GetInboundOrderDetail(string OrderNo) + { + WebResponseContent content = new WebResponseContent(); + try + { + Dt_InboundOrder inboundOrder = BaseDal.QueryFirst(x => x.OrderNo==OrderNo); + + var inboundOrderDetail = BaseDal.Db.Queryable<Dt_InboundOrderDetail>().Where(x=>x.OrderId==inboundOrder.Id).Take(10).Select(x => new Dt_InboundOrderDetail { MaterielCode = x.MaterielCode, MaterielName = x.MaterielName, OrderQuantity = x.OrderQuantity, ReceiptQuantity = x.ReceiptQuantity, OverInQuantity=x.OverInQuantity }).ToList(); + + content = WebResponseContent.Instance.OK(data: inboundOrderDetail); + } + catch (Exception ex) + { + content = WebResponseContent.Instance.Error($"鏌ヨ鍏ュ簱鍗曟嵁鏄庣粏閿欒,閿欒淇℃伅:{ex.Message}"); + } + return content; + } } } -- Gitblit v1.9.3