From bc3e001d093c3d6cbddc7e008aa99c12f850c1e5 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 26 十二月 2024 21:50:35 +0800
Subject: [PATCH] 更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
index 0c8493b..bd29729 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
@@ -5,11 +5,13 @@
using System.Threading.Tasks;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
+using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
using WIDESEA_IApprovalRepository;
using WIDESEA_ICheckRepository;
using WIDESEA_ICheckService;
+using WIDESEA_IInboundRepository;
using WIDESEA_Model.Models;
namespace WIDESEA_CheckService
@@ -17,10 +19,13 @@
public class CheckOrderResultService : ServiceBase<Dt_CheckOrderResult, ICheckOrderResultRepository>, ICheckOrderResultService
{
private readonly ICheckOrderRepository _checkOrderRepository;
-
- public CheckOrderResultService(ICheckOrderResultRepository BaseDal, ICheckOrderRepository checkOrderRepository) : base(BaseDal)
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IReceiveOrderRepository _receiveOrderRepository;
+ public CheckOrderResultService(ICheckOrderResultRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICheckOrderRepository checkOrderRepository, IReceiveOrderRepository receiveOrderRepository) : base(BaseDal)
{
_checkOrderRepository = checkOrderRepository;
+ _unitOfWorkManage = unitOfWorkManage;
+ _receiveOrderRepository = receiveOrderRepository;
}
/// <summary>
@@ -29,11 +34,17 @@
/// <param name="checkOrderId">璐ㄦ鍗曚富閿�</param>
/// <param name="checkResult">璐ㄦ缁撴灉瀵硅薄</param>
/// <returns></returns>
- public WebResponseContent CommitCheckResult(int checkOrderId, Dt_CheckOrderResult checkResult)
+ public WebResponseContent CommitCheckResult(int checkOrderId,Dt_CheckOrderResult checkResult)
{
try
{
Dt_CheckOrder checkOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderId == checkOrderId);
+ //鑾峰彇璐ㄦ鍗曞搴旂殑鏀惰揣鍗�
+ Dt_ReceiveOrder receiveOrder = _receiveOrderRepository.QueryFirst(x=>x.ReceiveOrderNo==checkOrder.ReceiveOrderNo);
+ if (receiveOrder.ReceiveOrderStatus!=ReceiveOrderStatusEnum.Completed.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"{receiveOrder.ReceiveOrderNo}鏀惰揣鍗曟湭瀹屾垚鏃犳硶璐ㄦ");
+ }
if (checkOrder == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌璐ㄦ鍗�");
@@ -75,8 +86,10 @@
Result = checkResult.Result,
Note = checkResult.Note
};
+ _unitOfWorkManage.BeginTran();
_checkOrderRepository.UpdateData(checkOrder);
BaseDal.AddData(checkOrderResult);
+ _unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3