From 9429653e8def2729014b45c7c75ec76e9aa6685b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 12 六月 2025 17:13:48 +0800
Subject: [PATCH] 优化堆垛机交互逻辑
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 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..26fbd5d 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;
@@ -88,6 +89,20 @@
return content;
}
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ try
+ {
+ if (saveModel.DetailData == null || saveModel.DetailData.Count == 0) throw new Exception($"鍏ュ簱鍗曟槑缁嗕笉鑳戒负绌�");
+ List<InboundOrderDetailAddDTO> inboundOrderDetail = saveModel.DetailData.DicToIEnumerable<InboundOrderDetailAddDTO>();
+ return base.UpdateData(saveModel);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
/// <summary>
/// 楠岃瘉鍗曟嵁娣诲姞DTO瀵硅薄
/// </summary>
@@ -119,5 +134,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