From 57148c2264abe80bd3b472f2980104d90dad5c61 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 13 九月 2025 08:35:32 +0800
Subject: [PATCH] 合并，接口优化等
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReturnOrderService.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReturnOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReturnOrderService.cs"
index 6d5f190..28713d7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReturnOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReturnOrderService.cs"
@@ -24,12 +24,14 @@
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IBasicRepository _basicRepository;
private readonly IOutboundService _outboundService;
+ private readonly IInboundRepository _inboundRepository;
public ReturnOrderService(IReturnOrderRepository BaseDal,IUnitOfWorkManage unitOfWorkManage,IBasicRepository basicRepository,
- IOutboundService outboundService) : base(BaseDal)
+ IOutboundService outboundService,IInboundRepository inboundRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_basicRepository = basicRepository;
_outboundService = outboundService;
+ _inboundRepository = inboundRepository;
}
/// <summary>
/// 鑾峰彇閫�鏂欏崟
@@ -189,6 +191,12 @@
{
return content.Error("璇ラ��鏂欏崟宸插畬鎴愭垨閫�鏂欎腑");
}
+ //鍒ゆ柇鏄惁鍒涘缓鍏ュ簱鍗�
+ Dt_InboundOrder InboundOld = _inboundRepository.InboundOrderRepository.QueryFirst(x=>x.UpperOrderNo== returnOrder.OrderNo);
+ if (InboundOld!=null)
+ {
+ return content.Error($"璇ラ��鏂欏崟{returnOrder.OrderNo}宸茬敓鎴愬叆搴撳崟鍙穥InboundOld.InboundOrderNo}");
+ }
List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
foreach (var item in returnOrder.Details)
{
@@ -218,6 +226,10 @@
Remark=returnOrder.Remark,
Details= inboundOrderDetails
};
+ if (returnOrder.ReturnOrderType==ReturnOrderTypeEnum.BomReturn.ObjToInt())
+ {
+ inboundOrder.OrderType = InOrderTypeEnum.BomReturn.ObjToInt();
+ }
returnOrder.ReturnOrderStatus=ReturnOrderStatusEnum.Returning.ObjToInt();
_unitOfWorkManage.BeginTran();
BaseDal.UpdateData(returnOrder);
--
Gitblit v1.9.3