美瑞安淮安立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
helongyang
18 小时以前 dc06f58d8ed537555fd529551180f43a0586ec3f 
 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs


@@ -206,7 +206,8 @@


                    {


                        return content.Error($"数量超出");


                    }


                    if (checkResult.Result == InspectResultEnum.Return.ToString())//退货


                    //判断检验结果


                    if (checkResult.Result == InspectResultEnum.Return.ToString())


                    {


                        checkOrder.DefectedNote = checkResult.Note;


                        checkOrder.ReturnQuantity += checkResult.Quantity;


@@ -248,8 +249,9 @@


                            }


                            else if(checkResult.Quantity< item.StockQuantity)


                            {


                                checkResult.Quantity = 0;


                                item.StockQuantity -= checkResult.Quantity;


                                item.OutboundQuantity = 0;


                                checkResult.Quantity = 0;


                                stockInfoDetails.Add(item);


                            }


                            else if (checkResult.Quantity >= item.StockQuantity)


@@ -287,6 +289,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)


@@ -298,6 +301,14 @@


                {


                    _stockRepository.StockInfoDetailRepository.UpdateData(stockInfoDetails);


                }


                if (initialStockDetails.Count>0)


                {


                    initialStockDetails.ForEach(x =>


                    {


                        x.OutboundQuantity = 0;


                    });


                    _stockRepository.StockInfoDetailRepository.UpdateData(initialStockDetails);


                }


                if (DelStockDetails.Count>0)


                {


                    _stockRepository.StockInfoDetailRepository.DeleteAndMoveIntoHty(DelStockDetails, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);