代码更新

wangxinhui

昨天 011ca316e6ec2ed93e31c45a9ebd9d3c66664871

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs

@@ -61,7 +61,7 @@
                }
                tasks.ForEach(x =>
                {
                    x.Grade = 99;
                    x.Grade = 1;
                });
                stockInfos.ForEach(x =>
                {
@@ -223,7 +223,7 @@
                            }
                            if (outStockLockInfosMES != null && outStockLockInfosMES.Count() > 0)
                            {
                                Dt_AGVStationInfo aGVStationInfo = _basicRepository.AGVStationInfoRepository.QueryFirst(x=>x.AGVStationCode==task.TargetAddress);
                                Dt_AGVStationInfo aGVStationInfo = _basicRepository.AGVStationInfoRepository.QueryFirst(x=>x.AGVStationCode==task.TargetAddress || x.MESPointCode == task.TargetAddress);
                                MESDeliveryModel mESDeliveryModel = MESDeliveryUp(outStockLockInfosMES, aGVStationInfo.MESPointCode);
                                MESResponse response = _invokeMESService.MESDelivery(mESDeliveryModel).DeserializeObject<MESResponse>() ?? throw new Exception("未获取到返回信息");
                                if (!response.Result)
@@ -395,8 +395,11 @@
                        taskType = outStockLockInfo.MachineName.ObjToInt() switch
                        {
                            (int)StationAreaEnum.二楼纸袋 => TaskTypeEnum.PaperYLOutZDGL,
                            (int)StationAreaEnum.二楼无纺布袋 => TaskTypeEnum.OutWFBGL,
                            (int)StationAreaEnum.一楼无纺淋膜 => TaskTypeEnum.OutWFBLM,
                            (int)StationAreaEnum.一楼印刷 => TaskTypeEnum.PrintYLOutbound,
                            (int)StationAreaEnum.一楼分切 => TaskTypeEnum.OutFenQie,
                            (int)StationAreaEnum.一楼纸张淋膜 => TaskTypeEnum.OutPaperLM,
                            _ => throw new Exception($"未找到加工中心任务类型分配")
                        };
                        Dt_Task task = new()
@@ -801,8 +804,12 @@
                {
                    tasks.ForEach(x =>
                    {
                        string orderNos = string.Join(",", outStockLockInfos.Where(t => t.PalletCode == x.PalletCode).Select(x => x.OrderNo).Distinct());
                        List<Dt_OutStockLockInfo> outStockNos = outStockLockInfos.Where(t => t.PalletCode == x.PalletCode).ToList();
                        List<int> outDetailIds = outStockNos.Select(t => t.OrderDetailId).ToList();
                        int numberNo = outboundOrderDetails.Where(t => outDetailIds.Contains(t.Id)).OrderBy(x => x.Number).FirstOrDefault().Number;
                        string orderNos = string.Join(",", outStockNos.Select(t => t.OrderNo).Distinct());
                        x.OrderNo = orderNos;
                        x.Grade = numberNo;
                    });
                }
                BaseDal.AddData(tasks);
@@ -895,12 +902,11 @@
                #region é¢†æ–™é€»è¾‘
                foreach (var item in stockInfos)
                {
                    if (item.StockStatus==StockStatusEmun.出库完成.ObjToInt())
                    if (item.StockStatus==StockStatusEmun.出库完成.ObjToInt() || item.StockStatus == StockStatusEmun.老厂退料暂存.ObjToInt())
                    {
                        item.StockLength = 0;
                        item.MaterielWeight = 0;
                        item.MaterielThickness = 0;
                        item.MaterielWide = 0;
                        item.StockOutLength = 0;
                        item.IsFull = WhetherEnum.True.ObjToInt();
                        item.IsPick = WhetherEnum.True.ObjToInt();
@@ -908,6 +914,7 @@
                }
                #endregion
                List<Dt_OutLineView> outLineViewsDel = _outboundRepository.OutLineViewRepository.QueryData(x => stockInfos.Select(x=>x.PalletCode).Contains(x.PalletCode));
                //数据库操作
                _unitOfWorkManage.BeginTran();
                _stockRepository.StockInfoRepository.UpdateData(stockInfos);
                _outboundRepository.OutStockLockInfoRepository.UpdateData(outStockLockInfos);
@@ -944,6 +951,76 @@
                    reseponse[i] = ints[i];
                }
                content = CreateSGOutboundTasks(reseponse);
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
        }
        /// <summary>
        /// åˆ›å»ºé”€å”®å‡ºåº“
        /// </summary>
        /// <param name="ids"></param>
        /// <returns></returns>
        public WebResponseContent CreateProDeliveryTasks(List<int> ids)
        {
            WebResponseContent content=new WebResponseContent();
            try
            {
                ////获取销售出库单据
                //List<Dt_ProDeliveryOrder> deliveryOrders = BaseDal.Db.Queryable<Dt_ProDeliveryOrder>().Where(x=> ids.Contains(x.Id)).Includes(x=>x.Details).ToList();
                //Dt_ProDeliveryOrder? proDeliveryOrder = deliveryOrders.FirstOrDefault(x => x.ProDeliveryStatus != OutOrderStatusEnum.未开始.ObjToInt());
                //if (proDeliveryOrder != null)
                //{
                //    return content.Error($"单号{proDeliveryOrder.DeliveryCode},订单状态{(OutOrderStatusEnum)proDeliveryOrder.ProDeliveryStatus}");
                //}
                //List<Dt_ProDeliveryOrderDetail> proDeliveryOrderDetails = deliveryOrders.SelectMany(x=>x.Details).ToList();
                //if (!proDeliveryOrderDetails.Any())
                //{
                //    throw new Exception($"未找到需出库的明细信息");
                //}
                //_unitOfWorkManage.BeginTran();
                //List<Dt_Task> tasks = new List<Dt_Task>();
                //List<Dt_ProStockInfo>? stockInfos = null;
                //List<Dt_ProDeliveryOrder>? Orders = null;
                //List<Dt_ProDeliveryOrderDetail>? OrderDetails = null;
                //List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                //List<Dt_LocationInfo>? locationInfos = null;
                //{
                //    //分配库存
                //    (List<Dt_ProStockInfo>, List<Dt_ProDeliveryOrder>, List<Dt_ProDeliveryOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.ProDeliveryOrderService.AssignProStockOutbound(deliveryOrders, proDeliveryOrderDetails);
                //    if (result.Item1 != null && result.Item1.Count > 0)
                //    {
                //        //创建任务
                //        tasks = GetTasks(result.Item1, result.Item3);
                //        result.Item3.ForEach(x =>
                //        {
                //            x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                //        });
                //        stockInfos = result.Item1;
                //        Orders = result.Item2;
                //        outStockLockInfos = result.Item3;
                //        locationInfos = result.Item4;
                //    }
                //}
                //if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count > 0)
                //{
                //    BaseDal.AddData(tasks);
                //    stockInfos.ForEach(x =>
                //    {
                //        x.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                //    });
                //    WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);

                //    if (!contentResponse.Status)
                //    {
                //        _unitOfWorkManage.RollbackTran();
                //        return content.Error(contentResponse.Message);
                //    }
                //}
                //_unitOfWorkManage.CommitTran();
            }
            catch (Exception ex)
            {
@@ -1028,90 +1105,90 @@
                _unitOfWorkManage.BeginTran();
                //操作数据，并分配需求库存
                _outboundRepository.OutMESOrderRepository.AddData(AddoutMESOrders);
                //List<Dt_OutMESOrder> mESOrders = _outboundRepository.OutMESOrderRepository.QueryData(x => AddoutMESOrders.Select(x => x.OutDetailId).Contains(x.OutDetailId));
                //{
                //    List<Dt_Task> tasks = new List<Dt_Task>();
                //    List<Dt_ProStockInfo>? stockInfos = null;
                //    List<Dt_OutMESOrder>? Orders = null;
                //    List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                //    List<Dt_LocationInfo>? locationInfos = null;
                //    {
                //        if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList().Count>0)
                //        {
                //            //分配库存
                //            (List<Dt_ProStockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignProStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList());
                //            if (result.Item1 != null && result.Item1.Count > 0)
                //            {
                //                //创建任务
                //                tasks = GetTasks(result.Item1, result.Item3);
                //                result.Item3.ForEach(x =>
                //                {
                //                    x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                //                });
                //                stockInfos = result.Item1;
                //                Orders = result.Item2;
                //                outStockLockInfos = result.Item3;
                //                locationInfos = result.Item4;
                //            }
                //        }
                //    }
                //    if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count>0)
                //    {
                //        BaseDal.AddData(tasks);
                //        stockInfos.ForEach(x =>
                //        {
                //            x.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                //        });
                //        WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);
                List<Dt_OutMESOrder> mESOrders = _outboundRepository.OutMESOrderRepository.QueryData(x => AddoutMESOrders.Select(x => x.OutDetailId).Contains(x.OutDetailId));
                {
                    List<Dt_Task> tasks = new List<Dt_Task>();
                    List<Dt_ProStockInfo>? stockInfos = null;
                    List<Dt_OutMESOrder>? Orders = null;
                    List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                    List<Dt_LocationInfo>? locationInfos = null;
                    {
                        if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList().Count > 0)
                        {
                            //分配库存
                            (List<Dt_ProStockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignProStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList());
                            if (result.Item1 != null && result.Item1.Count > 0)
                            {
                                //创建任务
                                tasks = GetTasks(result.Item1, result.Item3);
                                result.Item3.ForEach(x =>
                                {
                                    x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                                });
                                stockInfos = result.Item1;
                                Orders = result.Item2;
                                outStockLockInfos = result.Item3;
                                locationInfos = result.Item4;
                            }
                        }
                    }
                    if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count > 0)
                    {
                        BaseDal.AddData(tasks);
                        stockInfos.ForEach(x =>
                        {
                            x.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                        });
                        WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);

                //        if (!contentResponse.Status)
                //        {
                //            _unitOfWorkManage.RollbackTran();
                //            return content.Error(contentResponse.Message);
                //        }
                //    }
                //}
                //{
                //    List<Dt_Task> tasks = new List<Dt_Task>();
                //    List<Dt_StockInfo>? stockInfos = null;
                //    List<Dt_OutMESOrder>? Orders = null;
                //    List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                //    List<Dt_LocationInfo>? locationInfos = null;
                //    {
                //        if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt()).ToList().Count > 0)
                //        {
                //            //分配库存
                //            (List<Dt_StockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt()).ToList());
                //            if (result.Item1 != null && result.Item1.Count > 0)
                //            {
                //                //创建任务
                //                tasks = GetTasks(result.Item1, result.Item3);
                //                result.Item3.ForEach(x =>
                //                {
                //                    x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                //                });
                //                stockInfos = result.Item1;
                //                Orders = result.Item2;
                //                outStockLockInfos = result.Item3;
                //                locationInfos = result.Item4;
                //            }
                //        }
                //    }
                //    if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count>0)
                //    {
                //        BaseDal.AddData(tasks);
                //        stockInfos.ForEach(x =>
                //        {
                //            x.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                //        });
                //        WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);
                //        if (!contentResponse.Status)
                //        {
                //            _unitOfWorkManage.RollbackTran();
                //            return content.Error(contentResponse.Message);
                //        }
                //    }
                //}
                        if (!contentResponse.Status)
                        {
                            _unitOfWorkManage.RollbackTran();
                            return content.Error(contentResponse.Message);
                        }
                    }
                }
                {
                    List<Dt_Task> tasks = new List<Dt_Task>();
                    List<Dt_StockInfo>? stockInfos = null;
                    List<Dt_OutMESOrder>? Orders = null;
                    List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                    List<Dt_LocationInfo>? locationInfos = null;
                    {
                        if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt()).ToList().Count > 0)
                        {
                            //分配库存
                            (List<Dt_StockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt()).ToList());
                            if (result.Item1 != null && result.Item1.Count > 0)
                            {
                                //创建任务
                                tasks = GetTasks(result.Item1, result.Item3);
                                result.Item3.ForEach(x =>
                                {
                                    x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                                });
                                stockInfos = result.Item1;
                                Orders = result.Item2;
                                outStockLockInfos = result.Item3;
                                locationInfos = result.Item4;
                            }
                        }
                    }
                    if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count > 0)
                    {
                        BaseDal.AddData(tasks);
                        stockInfos.ForEach(x =>
                        {
                            x.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                        });
                        WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);
                        if (!contentResponse.Status)
                        {
                            _unitOfWorkManage.RollbackTran();
                            return content.Error(contentResponse.Message);
                        }
                    }
                }
                _unitOfWorkManage.CommitTran();
                return content.OK(ErrorMsg.IsNullOrEmpty()? "接收成功" : $"信息：{ErrorMsg}");
            }
@@ -1169,6 +1246,7 @@
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;