1

wankeda

3 天以前 a3014a01e07619105d597d0c51cf195217b0806f

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -60,18 +60,20 @@
                    {
                        Dt_Task task = new()
                        {
                            PalletType=stockInfo.PalletType,
                            OrderNo = stockInfoDetail.OrderNo,
                            CurrentAddress = "0",
                            CurrentAddress = locationInfo.LocationCode,
                            Grade = 0,
                            Creater = "WMS",
                            PalletCode = stockInfo.PalletCode,
                            NextAddress = "",
                            NextAddress = roadwayInfo.OutSCStationCode,
                            Roadway = locationInfo.RoadwayNo,
                            SourceAddress = stockInfo.LocationCode,
                            TargetAddress = roadwayInfo.OutStationCode,
                            SourceAddress = locationInfo.LocationCode,
                            TargetAddress = "",
                            TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
                            TaskType = TaskTypeEnum.Outbound.ObjToInt(),
                            Depth = locationInfo.Depth,
                            WarehouseId = stockInfo.WarehouseId,
                            TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                        };
                        tasks.Add(task);
@@ -80,8 +82,84 @@
                }

            }
            BaseDal.AddData(tasks);
            return tasks;
        }



        /// <summary>
        /// 出库任务数据处理
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutboundTaskDataHandle(int[] keys)
        {
            List<Dt_Task> tasks = new List<Dt_Task>();
            List<Dt_OutboundOrderDetail> outboundOrderDetails = _outboundService.OutboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id));

            if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
            {
                throw new Exception("未找到出库单明细信息");
            }
            if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
            {
                throw new Exception("所选出库单明细存在出库中或已完成");
            }
            List<Dt_StockInfo>? stockInfos = null;
            List<Dt_OutboundOrderDetail>? orderDetails = null;
            List<Dt_OutStockLockInfo>? outStockLockInfos = null;
            List<Dt_LocationInfo>? locationInfos = null;
            //if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
            {
                (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
                if (result.Item1 != null && result.Item1.Count > 0)
                {
                    Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
                    TaskTypeEnum typeEnum = outboundOrder.OrderType switch
                    {
                        (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
                        (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
                        (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
                        _ => new TaskTypeEnum()
                    };
                    tasks = GetTasks(result.Item1);
                    tasks.ForEach(x =>
                    {
                        x.OrderNo = outboundOrder.UpperOrderNo;
                    });
                    result.Item2.ForEach(x =>
                    {
                        x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                    });
                    result.Item3.ForEach(x =>
                    {

                        x.Status = OutStockStatus.出库中.ObjToInt();
                    });

                    stockInfos = result.Item1;
                    orderDetails = result.Item2;
                    outStockLockInfos = result.Item3;
                    locationInfos = result.Item4;
                }
                else
                {
                    throw new Exception("无库存");
                }
            }
            //else
            //{
            //    List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId, OutLockStockStatusEnum.已分配);
            //    if (stockLockInfos != null && stockLockInfos.Count > 0)
            //    {
            //        List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
            //        tasks = GetTasks(stocks);
            //    }
            //}

            return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
        }

        /// <summary>
@@ -157,45 +235,90 @@
            WebResponseContent content = new();
            try
            {
                OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                orderAddDTO1.OrderNo = orderAddDTO.No;
                orderAddDTO1.UpperOrderNo = orderAddDTO.No;
                orderAddDTO1.OutWareHouse = orderAddDTO.OutWareHouse;
                orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode;
                orderAddDTO1.InoutType = orderAddDTO.OrderType;
                orderAddDTO1.OrderType = orderAddDTO.InoutType.ObjToInt();
                IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
                //orderAddDTO1.OrderType = orderAddDTO.OrderType.ObjToInt();
                orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
                #region 验证数据
                (bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
                if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                #endregion

                Dt_OutboundOrder inboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO1);
                inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                inboundOrder.Creater = "WMS";
                inboundOrder.CreateDate = DateTime.Now;


                Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO1.OrderNo).Includes(x => x.Details).First();
                Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.OrderId == oldOutboundOrder.Id);
                List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
                StockSelectViewDTO stockSelectViewDTO = new()
                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == orderAddDTO.OutWareHouse);
                if (warehouse == null)
                {
                    OrderNo = orderAddDTO1.OrderNo,
                    MaterielCode = outboundOrderDetail.MaterielCode,
                    MaterielName = outboundOrderDetail.MaterielName,
                    UseableQuantity = outboundOrderDetail.OrderQuantity,
                    BatchNo = outboundOrderDetail.BatchNo,
                    LinId = outboundOrderDetail.LinId,
                    PalletCode = outboundOrderDetail.LPNNo,
                };
                _unitOfWorkManage.BeginTran();
                bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                stockSelectViews.Add(stockSelectViewDTO);
                GenerateOutboundTasks(oldOutboundOrder.Id, stockSelectViews);
                _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.Error($"未找到该仓库信息");
                }
                Dt_OutboundOrder oldOuboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO.No).Includes(x => x.Details).First();
                if (oldOuboundOrder != null)
                {
                    //if (oldOuboundOrder.Details.FirstOrDefault(x => x.LinId == Convert.ToInt32(orderAddDTO.LinId)) != null)
                    //{
                    //    return WebResponseContent.Instance.Error($"该明细行号已存在");
                    //}
                    if (oldOuboundOrder.OutWareHouse != warehouse.WarehouseCode)
                    {
                        return WebResponseContent.Instance.Error($"仓库不一致");
                    }
                    else
                    {
                        OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                        orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
                        var details = orderAddDTO1.Details.FirstOrDefault();
                        Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
                        {
                            LPNNo = details.LPNNo,
                            BatchNo = details.BatchNo,
                            MaterielCode = details.MaterielCode,
                            MaterielName = details.MaterielName,
                            MaterieSpec = details.MaterieSpec,
                            OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                            OrderQuantity = details.OrderQuantity,
                            OrderId = oldOuboundOrder.Id,
                            Creater = "WMS",
                            CreateDate = DateTime.Now,
                        };
                        _outboundOrderDetailRepository.AddData(outboundOrderDetail);
                        //_outboundOrderDetailRepository.AddData(outboundOrderDetail);
                    }
                }
                else
                {
                    OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                    orderAddDTO1.OrderNo = orderAddDTO.No;
                    orderAddDTO1.UpperOrderNo = orderAddDTO.No;
                    orderAddDTO1.OutWareHouse = orderAddDTO.OutWareHouse;
                    orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode;
                    orderAddDTO1.InoutType = orderAddDTO.OrderType;
                    orderAddDTO1.OrderType = orderAddDTO.InoutType.ObjToInt();
                    IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
                    //orderAddDTO1.OrderType = orderAddDTO.OrderType.ObjToInt();
                    orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
                    #region 验证数据
                    (bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
                    if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                    #endregion

                    Dt_OutboundOrder inboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO1);
                    inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                    inboundOrder.Creater = "WMS";
                    inboundOrder.CreateDate = DateTime.Now;
                    _unitOfWorkManage.BeginTran();
                    bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                    //Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO1.OrderNo).Includes(x => x.Details).First();
                    //Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.OrderId == oldOutboundOrder.Id);
                    //List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
                    //StockSelectViewDTO stockSelectViewDTO = new()
                    //{
                    //    OrderNo = orderAddDTO1.OrderNo,
                    //    MaterielCode = outboundOrderDetail.MaterielCode,
                    //    MaterielName = outboundOrderDetail.MaterielName,
                    //    UseableQuantity = outboundOrderDetail.OrderQuantity,
                    //    BatchNo = outboundOrderDetail.BatchNo,
                    //    LinId = outboundOrderDetail.LinId,
                    //    PalletCode = outboundOrderDetail.LPNNo,
                    //};


                    //stockSelectViews.Add(stockSelectViewDTO);
                    //GenerateOutboundTasks(oldOutboundOrder.Id, stockSelectViews);

                    _unitOfWorkManage.CommitTran();
                }


                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -338,6 +461,8 @@
            {
                WebResponseContent content = new WebResponseContent();
                _unitOfWorkManage.BeginTran();

                BaseDal.AddData(tasks);
                //判断移库
                //content = RelocationTasks(tasks.OrderBy(x => x.Depth).ToList());
                //if (content.Status)
@@ -350,19 +475,16 @@
                //    return content;
                //}
                //BaseDal.AddData(tasks);

                if (stockInfos != null && outboundOrderDetails != null && outStockLockInfos != null && locationInfos != null)
                {
                    content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);

                    if (content.Status)
                    {
                        _unitOfWorkManage.CommitTran();
                    }
                    else
                    if (!content.Status)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return content;
                    }
                    return content;
                }
                else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
                {
@@ -374,6 +496,8 @@
                    _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
                }
                _unitOfWorkManage.CommitTran();
                //将任务推送到WCS
                PushTasksToWCS(tasks);
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -478,7 +602,7 @@
                                    {
                                        PalletCode = dt_StockInfo.PalletCode,
                                        Roadway = locationInfos.RoadwayNo,
                                        TaskType = TaskTypeEnum.RelocationIn.ObjToInt(),
                                        //TaskType = TaskTypeEnum.RelocationIn.ObjToInt(),
                                        TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
                                        SourceAddress = locationInfos.LocationCode,
                                        TargetAddress = newLocation.LocationCode,
@@ -533,7 +657,7 @@
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        public WebResponseContent GenerateOutboundTask(int[] keys)
        public WebResponseContent WMSGenerateOutboundTask(int[] keys)
        {
            try
            {
@@ -546,7 +670,7 @@
                foreach (int key in keys)
                {

                    (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(key, stockSelectViews);
                    (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
                    if (result.Item2 != null && result.Item2.Count > 0)
                    {
                        stockInfos.AddRange(result.Item2);
@@ -592,7 +716,7 @@
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
            if (task != null)
            {
                if (task.TaskType == (int)TaskTypeEnum.Outbound || task.TaskType == (int)TaskTypeEnum.PalletOutbound)
                if (task.TaskType == (int)TaskTypeEnum.Outbound || task.TaskType == (int)TaskTypeEnum.EmptyProductBack)
                {
                    //处理出库的逻辑
                    Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
@@ -620,7 +744,7 @@
                    return content = WebResponseContent.Instance.Error($"出库任务取消成功");

                }
                else if (task.TaskType == (int)TaskTypeEnum.Inbound || task.TaskType == (int)TaskTypeEnum.PalletInbound)
                else if (task.TaskType == (int)TaskTypeEnum.Inbound || task.TaskType == (int)TaskTypeEnum.Inbound)
                {
                    //处理出库的逻辑
                    Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);