合并，接口优化等

wangxinhui

昨天 57148c2264abe80bd3b472f2980104d90dad5c61

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs

@@ -3,14 +3,18 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_External.Model;
using WIDESEA_IApprovalRepository;
using WIDESEA_IBasicRepository;
using WIDESEA_ICheckRepository;
using WIDESEA_ICheckService;
using WIDESEA_IInboundRepository;
@@ -30,7 +34,10 @@
        private readonly IPurchaseOrderDetailRepository _purchaseOrderDetailRepository;
        private readonly IOutboundRepository _outboundRepository;
        private readonly IStockRepository _stockRepository;
        public CheckOrderResultService(ICheckOrderResultRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICheckOrderRepository checkOrderRepository, IReceiveOrderRepository receiveOrderRepository, ICheckOrderService checkOrderService, IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IOutboundRepository outboundRepository, IStockRepository stockRepository) : base(BaseDal)
        private readonly IWarehouseRepository _warehouseRepository;
        private readonly IReceiveOrderDetailRepository _receiveOrderDetailRepository;

        public CheckOrderResultService(ICheckOrderResultRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICheckOrderRepository checkOrderRepository, IReceiveOrderRepository receiveOrderRepository, ICheckOrderService checkOrderService, IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IOutboundRepository outboundRepository, IStockRepository stockRepository,IWarehouseRepository warehouseRepository, IReceiveOrderDetailRepository receiveOrderDetailRepository) : base(BaseDal)
        {
            _checkOrderRepository = checkOrderRepository;
            _unitOfWorkManage = unitOfWorkManage;
@@ -40,6 +47,8 @@
            _purchaseOrderDetailRepository = purchaseOrderDetailRepository;
            _outboundRepository = outboundRepository;
            _stockRepository = stockRepository;
            _warehouseRepository=warehouseRepository;
            _receiveOrderDetailRepository = receiveOrderDetailRepository;
        }

        /// <summary>
@@ -60,6 +69,7 @@
                {
                    return content.Error($"未找到该质检单");
                }
                Dt_Warehouse warehouse = _warehouseRepository.QueryFirst(x => x.WarehouseId == checkOrder.WarehouseId);
                Dt_ReceiveOrder receiveOrder = _receiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == checkOrder.ReceiveOrderNo).Includes(x => x.Details).First();
                if (receiveOrder.ReceiveOrderStatus!=ReceiveOrderStatusEnum.Completed.ObjToInt())
                {
@@ -166,6 +176,144 @@
            }
            return content;
        }
        public WebResponseContent CommitCheckResult(ERPCheckModel checkModel)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_CheckOrder checkOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderNo == checkModel.Code);
                //获取质检单对应的收货单
                if (checkOrder == null)
                {
                    return content.Error($"未找到该质检单");
                }
                Dt_Warehouse warehouse = _warehouseRepository.QueryFirst(x => x.WarehouseId == checkOrder.WarehouseId);
                //获取收货单
                Dt_ReceiveOrder receiveOrder = _receiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == checkOrder.ReceiveOrderNo).Includes(x => x.Details).First();
                if (receiveOrder.ReceiveOrderStatus != ReceiveOrderStatusEnum.Completed.ObjToInt())
                {
                    return content.Error($"{receiveOrder.ReceiveOrderNo}收货单未完成无法质检");
                }
                if (checkOrder.CheckOrderStatus == CheckOrderStatusEnum.Checked.ObjToInt())
                {
                    return content.Error($"该单据已经检验完成");
                }
                Dt_CheckOrderResult? checkOrderResult = null;
                Dt_PurchaseOrder? purchaseOrder = null;
                Dt_PurchaseOrderDetail? purchaseOrderDetail = null;
                if (checkModel.Details.Count>0)
                {

                    ERPCheckResult eRPCheckResult = checkModel.Details.FirstOrDefault();
                    if (eRPCheckResult.Result == CheckResultEnum.Return.ToString())//退货
                    {
                        checkOrder.DefectedNote = eRPCheckResult.Result;
                        checkOrder.ReturnQuantity += (float)Convert.ToDecimal(eRPCheckResult.Quantity);
                    }
                    else
                    {
                        return content.Error($"未找到缺陷类型");
                    }
                    //检验结果
                    checkOrderResult = new Dt_CheckOrderResult()
                    {
                        Quantity = (float)Convert.ToDecimal(eRPCheckResult.Quantity),
                        CheckOrderId = checkOrder.CheckOrderId,
                        DefectCode = eRPCheckResult.DefectCode,
                        Result = eRPCheckResult.Result,
                        Note = eRPCheckResult.Note,
                        SampleCount = 0,
                    };
                    //获取对应采购单扣除收货数量
                    Dt_ReceiveOrderDetail receiveOrderDetail = receiveOrder.Details.First(x => x.RowNo == checkOrder.ReceiveDetailRowNo);
                    purchaseOrder = _purchaseOrderRepository.Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == receiveOrderDetail.PurchaseOrderNo).Includes(x => x.Details).Where(x => x.Details.Any(v => v.RowNo == receiveOrderDetail.PurchaseOrderDetailRowNo)).First();
                    if (purchaseOrder == null)
                    {
                        return content.Error("未找到对应收货采购单");
                    }
                    purchaseOrderDetail = purchaseOrder.Details.FirstOrDefault();
                    if (purchaseOrderDetail == null)
                    {
                        return content.Error("未找到退货对应的采购单明细");
                    }
                    purchaseOrderDetail.PurchaseDetailReceiveQty -= (float)Convert.ToDecimal(eRPCheckResult.Quantity);
                }
                //判断检验合格结果
                if (checkModel.Result == CheckAcceptEnum.Accept.ToString())
                {
                    checkOrder.Result = CheckAcceptEnum.Accept.ToString();
                }
                else if (checkModel.Result == CheckAcceptEnum.UnAccept.ToString())
                {
                    checkOrder.Result = CheckAcceptEnum.UnAccept.ToString();
                }
                else
                {
                    return content.Error("未找到检验类型");
                }
                checkOrder.CheckOrderStatus = CheckOrderStatusEnum.Checked.ObjToInt();
                List<Dt_ReceiveOrderDetail> receiveOrderDetails = new List<Dt_ReceiveOrderDetail>();
                //根据检验数量扣除合格数量
                if (checkOrderResult != null)
                {
                    checkOrder.QualifiedQuantity = checkOrder.ReceivedQuantity - checkOrderResult.Quantity;
                    //更新收货检验合格标识
                    if (warehouse.WarehouseCode == WarehouseEnum.HA152.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA58.ToString())
                    {
                        receiveOrderDetails = receiveOrder.Details.Where(x=>x.RowNo==checkOrder.ReceiveDetailRowNo).OrderByDescending(x => x.RowNo).Take((int)checkOrderResult.Quantity).ToList();
                        receiveOrderDetails.ForEach(x =>
                        {
                            x.IsCheckOk = WhetherEnum.True.ObjToInt();
                        });
                    }
                }
                else
                {
                    checkOrder.QualifiedQuantity = checkOrder.ReceivedQuantity;
                }
                checkOrder.CheckUserName = App.User.UserName;
                
                _unitOfWorkManage.BeginTran();
                if (receiveOrderDetails.Count > 0)
                {
                    _receiveOrderDetailRepository.UpdateData(receiveOrderDetails);
                }
                //更新采购单
                if (checkOrderResult != null && purchaseOrder != null && purchaseOrderDetail != null)
                {
                    BaseDal.AddData(checkOrderResult);
                    if (purchaseOrder.PurchaseOrderStatus >= PurchaseOrderStatusEnum.Received.ObjToInt())
                    {
                        purchaseOrder.PurchaseOrderStatus = PurchaseOrderStatusEnum.Receiving.ObjToInt();
                        _purchaseOrderRepository.UpdateData(purchaseOrder);
                    }
                    if (purchaseOrderDetail.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.Received.ObjToInt())
                    {
                        purchaseOrderDetail.PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.Receiving.ObjToInt();
                    }
                    _purchaseOrderDetailRepository.UpdateData(purchaseOrderDetail);
                }
                if (string.IsNullOrEmpty(checkModel.CreatorCode))
                {
                    //ERP上报
                    WebResponseContent responseContent = _checkOrderService.FeedbackCheckResult(checkOrder, checkOrderResult != null ? new List<Dt_CheckOrderResult> { checkOrderResult } : new List<Dt_CheckOrderResult>());
                    if (!responseContent.Status)
                    {
                        throw new Exception(responseContent.Message);
                    }
                } 
                checkOrder.UploadStatus = CheckUploadEnum.UploadOk.ObjToInt();
                _checkOrderRepository.UpdateData(checkOrder);
                _unitOfWorkManage.CommitTran();
                content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return content.Error($"{ex.Message}");
            }
            return content;
        }
        /// <summary>
        /// æäº¤é€æ£€ç¡®è®¤ç»“æžœ
        /// </summary>
@@ -179,7 +327,7 @@
            try
            {
                Dt_CheckOrder checkOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderId == checkOrderId);
                //获取质检单对应的收货单
                //获取质检单
                if (checkOrder == null)
                {
                    return content.Error($"未找到该质检单");
@@ -206,7 +354,8 @@
                    {
                        return content.Error($"数量超出");
                    }
                    if (checkResult.Result == InspectResultEnum.Return.ToString())//退货
                    //判断检验结果
                    if (checkResult.Result == InspectResultEnum.Return.ToString())
                    {
                        checkOrder.DefectedNote = checkResult.Note;
                        checkOrder.ReturnQuantity += checkResult.Quantity;
@@ -234,32 +383,25 @@
                        Note = checkResult.Note,
                        SampleCount = checkResult.SampleCount,
                    };
                    if (Math.Round(checkResult.Quantity,2) == Math.Round(stockInfoDetails.Sum(x=>x.StockQuantity),2))
                    foreach (var item in stockInfo.Details)
                    {
                        DelStockDetails = stockInfo.Details;
                    }
                    else
                    {
                        foreach (var item in stockInfo.Details)
                        if (checkResult.Quantity == 0)
                        {
                            if (checkResult.Quantity == 0)
                            {
                                break;
                            }
                            else if(checkResult.Quantity< item.StockQuantity)
                            {
                                checkResult.Quantity = 0;
                                item.StockQuantity -= checkResult.Quantity;
                                stockInfoDetails.Add(item);
                            }
                            else if (checkResult.Quantity >= item.StockQuantity)
                            {
                                checkResult.Quantity = (float)Math.Round((checkResult.Quantity-item.StockQuantity), 2);
                                DelStockDetails.Add(item);
                            }
                            break;
                        }
                        else if (checkResult.Quantity < item.StockQuantity)
                        {
                            item.StockQuantity -= checkResult.Quantity;
                            item.OutboundQuantity = 0;
                            checkResult.Quantity = 0;
                            stockInfoDetails.Add(item);
                        }
                        else if (checkResult.Quantity >= item.StockQuantity)
                        {
                            checkResult.Quantity = (float)Math.Round((checkResult.Quantity - item.StockQuantity), 2);
                            DelStockDetails.Add(item);
                        }
                    }
                    
                }
                if (IsAccept == InspectAcceptEnum.Accept.ObjToInt())
                {
@@ -287,6 +429,7 @@
                    checkOrder.QualifiedQuantity = checkOrder.ReceivedQuantity;
                }
                checkOrder.CheckUserName = App.User.UserName;
                List<Dt_StockInfoDetail> initialStockDetails = stockInfo.Details.Where(x=> !(stockInfoDetails.Select(v=>v.Id).ToList()).Contains(x.Id)).ToList();
                _unitOfWorkManage.BeginTran();

                if (checkOrderResult != null)
@@ -296,7 +439,20 @@
                //清除库存数量
                if (stockInfoDetails.Count>0)
                {
                    stockInfoDetails.ForEach(x =>
                    {
                        x.Status = StockStatusEmun.送检库存完成.ObjToInt();
                    });
                    _stockRepository.StockInfoDetailRepository.UpdateData(stockInfoDetails);
                }
                if (initialStockDetails.Count>0)
                {
                    initialStockDetails.ForEach(x =>
                    {
                        x.OutboundQuantity = 0;
                        x.Status = StockStatusEmun.送检库存完成.ObjToInt();
                    });
                    _stockRepository.StockInfoDetailRepository.UpdateData(initialStockDetails);
                }
                if (DelStockDetails.Count>0)
                {
@@ -306,6 +462,11 @@
                {
                    _stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);
                }
                else
                {
                    stockInfo.StockStatus = StockStatusEmun.送检库存完成.ObjToInt();
                    _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                }
                //ERP上报
                WebResponseContent responseContent = _checkOrderService.FeedbackInspectResult(checkOrder, checkOrderResult != null ? new List<Dt_CheckOrderResult> { checkOrderResult } : new List<Dt_CheckOrderResult>());
                if (!responseContent.Status)