dengjunjie
2024-12-05 46e98339480d853fc78a014c34d7ff9fcaf13890
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs
@@ -161,47 +161,63 @@
            {
                var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
                if (task == null) throw new Exception($"未找到托盘号[{lineDTO.Barcode}]的入库任务");
                if (task.TaskState >= (int)InTaskStatusEnum.Line_InFinish) throw new Exception($"托盘号[{lineDTO.Barcode}]的入库任务状态不匹配");
                if (task.TaskState >= (int)InTaskStatusEnum.SC_InExecuting) throw new Exception($"托盘号[{lineDTO.Barcode}]的入库任务状态不匹配");
                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(lineDTO.Barcode);
                if (stockInfo == null) throw new Exception($"未找到托盘[{lineDTO.Barcode}]的组盘信息");
                Dt_StockInfoDetail? stockInfoDetail = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault();
                if (stockInfoDetail == null) throw new Exception($"未找到托盘[{lineDTO.Barcode}]的组盘详情");
                if (stockInfo.StockStatus != StockStatusEmun.入库确认.ObjToInt()) throw new Exception($"托盘[{lineDTO.Barcode}],该组盘状态不可入库");
                if (stockInfo.StockStatus != StockStatusEmun.入库确认.ObjToInt() || !string.IsNullOrEmpty(stockInfo.LocationCode))
                    throw new Exception($"托盘[{lineDTO.Barcode}],该组盘状态不可入库");
                Dt_InboundOrder inboundOrder = _inboundService.InbounOrderService.GetInboundOrder(stockInfoDetail.OrderNo);
                if (inboundOrder == null || inboundOrder.Details == null) throw new Exception($"未找到托盘[{lineDTO.Barcode}]的入库单明细信息");
                Dt_StockInfo instockInfo = null;
                Dt_LocationInfo locationInfo = null;
                #region åˆ¤æ–­å½“前入库托盘批次号是否存在已分配入库
                Dt_StockInfoDetail instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo, stockInfoDetail.BatchNo);
                if (instockInfoDetail != null) instockInfo = _stockService.StockInfoService.Repository.GetStockInfo(instockInfoDetail.StockId);
                if (instockInfo != null)
                #region åˆ¤æ–­æ˜¯å¦æŒ‡å®šè´§ä½
                Dt_InboundOrderDetail orderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfoDetail.BatchNo);
                if (orderDetail != null && !string.IsNullOrEmpty(orderDetail.LocationCode))
                {
                    locationInfo = _basicService.LocationInfoService.GetLocation(instockInfo.LocationCode);
                    locationInfo = _basicService.LocationInfoService.GetLocation(orderDetail.LocationCode);
                }
                #endregion
                #region åˆ¤æ–­å½“前入库托盘批次号是否存在已分配入库
                else
                {
                    instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo);//入库单存在库存,判断货位
                    Dt_StockInfo instockInfo = null;
                    Dt_StockInfoDetail instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo, stockInfoDetail.BatchNo);
                    if (instockInfoDetail != null) instockInfo = _stockService.StockInfoService.Repository.GetStockInfo(instockInfoDetail.StockId);
                    if (instockInfo != null)
                    {
                        locationInfo = _basicService.LocationInfoService.GetLocation(instockInfo.LocationCode);
                        //if (locationInfo.MaxQty == 12)
                        //{
                        //    locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
                        //    _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
                        //    locationInfo = null;
                        //}
                        if (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt()) locationInfo = null;
                        else
                        if (locationInfo?.MaxQty <= locationInfo?.CurrentQty) locationInfo = null;
                    }
                    #endregion
                    else
                    {
                        instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo);//入库单存在库存,判断货位
                        if (instockInfoDetail != null) instockInfo = _stockService.StockInfoService.Repository.GetStockInfo(instockInfoDetail.StockId);
                        if (instockInfo != null)
                        {
                            List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Get_StockInfoDetails(stockInfoDetail.OrderNo);//获取工单所有已入库或入库中库存
                            if (stockInfoDetails.GroupBy(x => x.BatchNo).Count() < 2) locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
                            else locationInfo = null;
                            locationInfo = _basicService.LocationInfoService.GetLocation(instockInfo.LocationCode);
                            //if (locationInfo.MaxQty == 12)
                            //{
                            //    locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
                            //    _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
                            //    locationInfo = null;
                            //}
                            if (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt()) locationInfo = null;
                            else
                            {
                                List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Get_StockInfoDetails(stockInfoDetail.OrderNo);//获取工单所有已入库或入库中库存
                                if (stockInfoDetails.GroupBy(x => x.BatchNo).Count() < 2) locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
                                else locationInfo = null;
                            }
                            if (locationInfo?.MaxQty <= locationInfo?.CurrentQty) locationInfo = null;
                        }
                    }
                    if (locationInfo == null)
                    {
                        int inboundOrderCount = inboundOrder.Details.Count;
@@ -210,6 +226,8 @@
                        locationInfo = _basicService.LocationInfoService.AssignLocation(inboundOrderCount);//重新分配货位
                    }
                }
                if (locationInfo == null) throw new Exception($"无可入货位");
                #region ä¿®æ”¹åº“存及货位信息
@@ -222,6 +240,7 @@
                stockInfo.StockStatus = StockStatusEmun.入库中.ObjToInt();
                stockInfoDetail.Status = StockStatusEmun.入库中.ObjToInt();
                locationInfo.CurrentQty++;
                if (locationInfo.MaxQty < locationInfo.CurrentQty) throw new Exception();
                if (locationInfo.MaxQty == 12) locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
                locationInfo.LocationStatus = LocationStatusEnum.Inbounding.ObjToInt();