增加质检出入库逻辑

dengjunjie

4 天以前 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -52,6 +52,7 @@
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
using WIDESEA_OutboundRepository;
using WIDESEA_StockRepository;
using WIDESEA_TaskInfoRepository;
using WIDESEAWCS_DTO.WCSInfo;

@@ -67,11 +68,13 @@
        private readonly IInboundService _inboundService;
        private readonly IRecordService _recordService;
        private readonly IStockService _stockService;
        private readonly IInventoryInfoRepository _inventoryInfoRepository;
        private readonly IInventoryBatchRepository _inventoryBatchRepository;
        private readonly IBasicRepository _basicRepository;

        public ITaskRepository Repository => BaseDal;

        public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, IBasicRepository basicRepository) : base(BaseDal)
        public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, IInventoryInfoRepository inventoryInfoRepository, IInventoryBatchRepository inventoryBatchRepository, IBasicRepository basicRepository) : base(BaseDal)
        {
            _mapper = mapper;
            _unitOfWorkManage = unitOfWorkManage;
@@ -79,6 +82,8 @@
            _outboundService = outboundService;
            _inboundService = inboundService;
            _recordService = recordService;
            _inventoryInfoRepository = inventoryInfoRepository;
            _inventoryBatchRepository = inventoryBatchRepository;
            _stockService = stockService;
            _basicRepository = basicRepository;
        }
@@ -251,6 +256,162 @@

            return WebResponseContent.Instance.OK();
        }
        public WebResponseContent OutQC(string batchNo, int qty)
        {
            WebResponseContent webResponse = new WebResponseContent().OK();
            try
            {
                Dt_Inventory_Batch inventory_Batch = _inventoryBatchRepository.QueryFirst(x => x.BatchNo == batchNo);
                if (inventory_Batch == null) return webResponse.Error($"未找到批号【{batchNo}】的库存批次信息");
                if (inventory_Batch.ProductStatus != ProductStatusEmun.待检1.ObjToInt())
                    return webResponse.Error($"批号【{batchNo}】已质检入库");
                List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoRepository.QueryData(x => x.BatchNo == batchNo && x.StockStatus == StockStatusEmun.已入库.ObjToInt()).OrderByDescending(x => x.InDate).Take(qty).ToList();
                if (_InventoryInfos.Count < 1) return webResponse.Error($"未找到批号【{batchNo}】的库存");
                Dt_LocationInfo locationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.LocationCode == _InventoryInfos.First().LocationCode);
                List<Dt_Task> tasks = new List<Dt_Task>();
                List<Dt_OutStockLockInfo> OutStockLockInfos = new List<Dt_OutStockLockInfo>();
                #region ç”Ÿæˆè´¨æ£€å‡ºåº“单
                Dt_OutboundOrderDetail orderDetail = new Dt_OutboundOrderDetail()
                {
                    BatchNo = batchNo,
                    Creater = "System",
                    OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt()
                };
                Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder()
                {
                    CreateType = CreateType.CreateInSystem.ObjToInt(),
                    OrderStatus = OutboundStatusEnum.出库中.ObjToInt(),
                    OrderNo = batchNo,
                    OrderType = OutOrderTypeEnum.Quality.ObjToInt(),
                    Creater = "System",
                    Details = new List<Dt_OutboundOrderDetail>() { orderDetail }
                };
                #endregion
                foreach (var item in _InventoryInfos)
                {
                    orderDetail.MaterielCode = item.MaterielCode;
                    orderDetail.MaterielName = item.MaterielName;
                    orderDetail.OrderQuantity += item.StockQuantity;
                    orderDetail.LockQuantity += item.StockQuantity;
                    item.OutboundQuantity = item.StockQuantity;
                    item.StockStatus = StockStatusEmun.出库中.ObjToInt();
                    Dt_Task task = new Dt_Task()
                    {
                        CurrentAddress = item.LocationCode,
                        Grade = 0,
                        PalletCode = item.PalletCode,
                        SourceIsPickPlace = item.SerialNumber == locationInfo.MaxQty,
                        NextAddress = "1005",
                        Roadway = "SC01",
                        SourceAddress = item.LocationCode,
                        TargetAddress = "1005",
                        TaskState = OutTaskStatusEnum.OutNew.ObjToInt(),
                        TaskType = TaskTypeEnum.OutQuality.ObjToInt(),
                        TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                    };
                    tasks.Add(task);
                    #region æ·»åŠ å‡ºåº“详情
                    Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
                    {
                        PalletCode = item.PalletCode,
                        AssignQuantity = item.OutboundQuantity,
                        MaterielCode = item.MaterielCode,
                        BatchNo = item.BatchNo,
                        LocationCode = item.LocationCode,
                        MaterielName = item.MaterielName,
                        OrderDetailId = orderDetail.Id,
                        OrderNo = outboundOrder.OrderNo,
                        OrderType = outboundOrder.OrderType,
                        OriginalQuantity = item.StockQuantity,
                        Status = OutLockStockStatusEnum.出库中.ObjToInt(),
                        StockId = item.Id,
                        TaskNum = task.TaskNum,
                        OrderQuantity = orderDetail.OrderQuantity
                    };
                    OutStockLockInfos.Add(outStockLockInfo);
                    #endregion
                }

                #region ç”Ÿæˆè´¨æ£€å…¥åº“单
                Dt_InboundOrderDetail inboundOrderDetail = new Dt_InboundOrderDetail()
                {
                    BatchNo = batchNo,
                    Creater = "System",
                    OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                    MaterielName = orderDetail.MaterielName,
                    MaterielCode = orderDetail.MaterielCode,
                    OrderQuantity = orderDetail.OrderQuantity
                };
                Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
                {
                    CreateType = CreateType.CreateInSystem.ObjToInt(),
                    OrderStatus = InboundStatusEnum.未开始.ObjToInt(),
                    OrderNo = batchNo,
                    OrderType = InOrderTypeEnum.Quality.ObjToInt(),
                    Creater = "System",
                    Details = new List<Dt_InboundOrderDetail>() { inboundOrderDetail }
                };
                #endregion
                #region å¤„理库存和库存批次信息
                inventory_Batch.StockQuantity = Convert.ToInt32(inventory_Batch.StockQuantity - orderDetail.OrderQuantity);

                inventory_Batch.BoxQuantity = inventory_Batch.StockQuantity / 8;
                if (inventory_Batch.StockQuantity % 8 > 0) inventory_Batch.BoxQuantity++;
                inventory_Batch.OutboundQuantity = Convert.ToInt32(inventory_Batch.OutboundQuantity + orderDetail.OrderQuantity);
                #endregion
                #region äº‹åŠ¡å¤„理
                Db.Ado.BeginTran();
                BaseDal.AddData(tasks);
                _outboundService.OutboundOrderService.Repository.Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
                _outboundService.OutboundStockLockInfoService.Repository.AddData(OutStockLockInfos);
                _inboundService.InbounOrderService.Repository.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                _inventoryInfoRepository.UpdateData(_InventoryInfos);
                _inventoryBatchRepository.UpdateData(inventory_Batch);
                #region ä¸‹å‘任务给WCS
                List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(tasks);
                var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ReceiveTask, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
                if (ResultData.Result == null) throw new Exception($"向WCS下发出库任务超时");
                WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
                if (content == null) throw new Exception($"下发出库任务WCS无响应");
                if (!content.Status) throw new Exception(content.Message);
                #endregion
                Db.Ado.CommitTran();
                #endregion
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                webResponse.Error(ex.Message);
            }
            return webResponse;
        }
        public WebResponseContent ModifyQty(string palletCode, int qty)
        {
            WebResponseContent webResponseContent = new WebResponseContent();
            try
            {
                Dt_InventoryInfo inventoryInfo = _inventoryInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
                if (inventoryInfo == null) throw new Exception("未找到托盘信息");
                if (inventoryInfo.StockStatus != StockStatusEmun.组盘暂存.ObjToInt() && inventoryInfo.StockStatus != StockStatusEmun.入库确认.ObjToInt() && inventoryInfo.StockStatus != StockStatusEmun.入库中.ObjToInt())
                    throw new Exception($"托盘非入库中,不可修改数量");
                Dt_InboundOrderDetail orderDetail = _inboundService.InboundOrderDetailService.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo);
                var StockQty = inventoryInfo.StockQuantity;
                inventoryInfo.StockQuantity = qty;
                inventoryInfo.BoxQuantity = qty % 8 > 0 ? qty / 8 + 1 : qty / 8;
                if (orderDetail != null)
                {
                    orderDetail.ReceiptQuantity -= StockQty - qty;
                    _inboundService.InboundOrderDetailService.Repository.UpdateData(orderDetail);
                }
                _inventoryInfoRepository.UpdateData(inventoryInfo);
                return webResponseContent.OK();
            }
            catch (Exception ex)
            {
                return webResponseContent.Error(ex.Message);
            }
        }

        public WebResponseContent ModifyBarcode(string barcode, string newBarcode)
        {
            WebResponseContent webResponseContent = new WebResponseContent();
@@ -260,11 +421,17 @@
                if (dt_Task == null) throw new Exception($"未找到托盘号为【{barcode}】的任务！");
                if (TaskEnumHelper.GetTaskTypeGroup(dt_Task.TaskType) != TaskTypeGroup.InboundGroup)
                    throw new Exception($"只可修改入库任务,如需修改其他任务类型请联系管理员！");
                var stock = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == newBarcode);
                if (stock != null) throw new Exception($"托盘号【{newBarcode}】已存在库存信息！");
                stock = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == barcode);
                if (stock == null) throw new Exception($"托盘号【{barcode}】未找到库存信息！");
                stock.PalletCode = newBarcode;
                Dt_InventoryInfo inventoryInfo = _inventoryInfoRepository.QueryFirst(x => x.PalletCode == newBarcode);
                if (inventoryInfo != null) throw new Exception($"托盘号【{newBarcode}】已存在库存信息！");
                inventoryInfo = _inventoryInfoRepository.QueryFirst(x => x.PalletCode == barcode);
                if (inventoryInfo == null) throw new Exception($"托盘号【{barcode}】未找到库存信息！");
                inventoryInfo.PalletCode = newBarcode;

                //var stock = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == newBarcode);
                //if (stock != null) throw new Exception($"托盘号【{newBarcode}】已存在库存信息！");
                //stock = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == barcode);
                //if (stock == null) throw new Exception($"托盘号【{barcode}】未找到库存信息！");
                //stock.PalletCode = newBarcode;
                dt_Task.PalletCode = newBarcode;
                Db.Ado.BeginTran();
                WMSTaskDTO wMSTaskDTOs = _mapper.Map<WMSTaskDTO>(dt_Task);
@@ -274,7 +441,8 @@
                if (content == null) throw new Exception($"WCS无响应");
                if (!content.Status) throw new Exception(content.Message);
                BaseDal.UpdateData(dt_Task);
                _stockService.StockInfoService.Repository.UpdateData(stock);
                //_stockService.StockInfoService.Repository.UpdateData(stock);
                _inventoryInfoRepository.UpdateData(inventoryInfo);
                Db.Ado.CommitTran();
                webResponseContent.OK();
            }
@@ -336,7 +504,7 @@
                    //if (WMStask.TaskState != nextStatus) return WebResponseContent.Instance.Error($"该任务状态有误,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                    //task.TaskState = nextStatus;
                    task.TaskState = TaskInStatusEnum.InFinish.ObjToInt();
                    content = UpdateTaskStatusInFinish(task);
                    content = NewUpdateTaskStatusInFinish(task);
                }
                else if (TaskEnumHelper.GetTaskTypeGroup(task.TaskType) == TaskTypeGroup.OutbondGroup)
                {
@@ -347,21 +515,21 @@
                    switch (task.TaskState)
                    {
                        case (int)TaskOutStatusEnum.SC_OutFinish://更新货位库存信息
                            UpdateTaskStatusSC_OutFinish(task);
                            content = NewUpdateTaskStatusSC_OutFinish(task);
                            break;
                        case (int)TaskOutStatusEnum.AGV_OutFinish:
                            {
                                task.CurrentAddress = WMStask.CurrentAddress;
                                task.TargetAddress = WMStask.TargetAddress;
                                task.NextAddress = string.Empty;
                                UpdateData(task);
                                content = UpdateData(task);
                            }
                            break;
                        case (int)TaskOutStatusEnum.OutFinish:
                            UpdateTaskStatusOutFinish(task);
                            content = UpdateTaskStatusOutFinish(task);
                            break;
                        default:
                            UpdateData(task);
                            content = UpdateData(task);
                            break;
                    }
                }
@@ -379,6 +547,81 @@
                content.Error(ex.Message);
            }
            return content;
        }
        public WebResponseContent NewUpdateTaskStatusSC_OutFinish(Dt_Task task)
        {
            try
            {
                Dt_Inventory_Batch? inventory_Batch = null;
                Dt_OutboundOrderDetail? orderDetail = null;
                Dt_OutboundOrder? outboundOrder = null;
                Dt_InventoryInfo inventoryInfo = _inventoryInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
                if (inventoryInfo != null)
                {
                    inventory_Batch = _inventoryBatchRepository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo);
                    orderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo);
                }
                Dt_LocationInfo Sourcelocation = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);

                Dt_OutStockLockInfo outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.TaskNum == task.TaskNum && task.PalletCode == x.PalletCode);
                Db.Ado.BeginTran();
                if (inventoryInfo != null) _inventoryInfoRepository.DeleteData(inventoryInfo);

                if (Sourcelocation != null)
                {
                    if (BaseDal.QueryFirst(x => x.SourceAddress == task.SourceAddress && x.TaskState < TaskOutStatusEnum.SC_OutFinish.ObjToInt()) == null)
                        Sourcelocation.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                    Sourcelocation.CurrentQty--;
                    if (Sourcelocation.CurrentQty <= 0)
                    {
                        Sourcelocation.CurrentQty = 0;
                        Sourcelocation.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                        Sourcelocation.EnableStatus = EnableStatusEnum.Normal.ObjToInt();
                    }
                    _basicService.LocationInfoService.Repository.UpdateData(Sourcelocation);
                }
                if (inventory_Batch != null)
                {
                    //inventory_Batch.StockQuantity -= inventoryInfo.StockQuantity;
                    inventory_Batch.OutboundQuantity -= inventoryInfo.StockQuantity;
                    if (inventory_Batch.StockQuantity == 0 && inventory_Batch.OutboundQuantity == 0)
                        _inventoryBatchRepository.DeleteData(inventory_Batch);
                    else _inventoryBatchRepository.UpdateData(inventory_Batch);
                }
                if (orderDetail != null)
                {
                    if (outStockLockInfo != null)
                    {
                        outStockLockInfo.OrderDetailId = orderDetail.OrderId;
                        _outboundService.OutboundStockLockInfoService.Repository.UpdateData(outStockLockInfo);
                    }
                    orderDetail.OverOutQuantity += inventoryInfo.StockQuantity;
                    if (orderDetail.OverOutQuantity == orderDetail.OrderQuantity)
                    {
                        outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == orderDetail.OrderId);
                        if (outboundOrder != null)
                        {
                            outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
                            _outboundService.OutboundOrderService.Repository.DeleteAndMoveIntoHty(outboundOrder, OperateType.自动完成);
                        }
                        orderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                        _outboundService.OutboundOrderDetailService.Repository.DeleteAndMoveIntoHty(orderDetail, OperateType.自动完成);
                    }
                    else
                        _outboundService.OutboundOrderDetailService.Repository.UpdateData(orderDetail);
                }
                task.CurrentAddress = "1005";
                task.TargetAddress = "1008";
                task.NextAddress = "1008";
                UpdateData(task);
                Db.Ado.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// ä¿®æ”¹ä»»åŠ¡çŠ¶æ€ä¸ºå †åž›æœºå‡ºåº“完成
@@ -437,7 +680,7 @@
            try
            {
                Db.Ado.BeginTran();
                Dt_OutStockLockInfo? outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.TaskNum == task.TaskNum);
                Dt_OutStockLockInfo? outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.TaskNum == task.TaskNum && x.PalletCode == task.PalletCode);
                Dt_OutboundOrder? outboundOrder = null;
                Dt_OutboundOrderDetail? outboundOrderDetail = null;
                int overCount = 0;
@@ -533,6 +776,69 @@
        /// <summary>
        /// æ›´æ–°å…¥åº“任务状态完成
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        public WebResponseContent NewUpdateTaskStatusInFinish(Dt_Task task)
        {
            WebResponseContent content = new WebResponseContent().OK();
            try
            {
                Dt_InventoryInfo inventoryInfo = _inventoryInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
                if (inventoryInfo == null) return content.Error("未找到托盘信息");
                Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);//货位
                if (locationInfo == null) return content.Error("未找到货位信息");
                if (task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt())
                {
                    return content;
                }
                inventoryInfo.InDate = DateTime.Now;
                inventoryInfo.StockStatus = StockStatusEmun.已入库.ObjToInt();
                int beforeStatus = locationInfo.LocationStatus;
                if (BaseDal.QueryFirst(x => x.TargetAddress == locationInfo.LocationCode && x.TaskNum != task.TaskNum) == null)
                    locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                task.CurrentAddress = task.NextAddress;
                task.NextAddress = string.Empty;

                Dt_Inventory_Batch inventory_Batch = _inventoryBatchRepository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo);
                Db.Ado.BeginTran();
                if (inventory_Batch == null)
                {
                    inventory_Batch = new Dt_Inventory_Batch()
                    {
                        BatchNo = inventoryInfo.BatchNo,
                        BoxQuantity = inventoryInfo.BoxQuantity,
                        MaterielCode = inventoryInfo.MaterielCode,
                        MaterielName = inventoryInfo.MaterielName,
                        OutboundQuantity = inventoryInfo.OutboundQuantity,
                        StockQuantity = inventoryInfo.StockQuantity,
                        ProductionDate = inventoryInfo.ProductionDate,
                        ProductStatus = inventoryInfo.ProductStatus,
                        ShelfLife = inventoryInfo.ShelfLife,
                        ValidityPeriod = inventoryInfo.ValidityPeriod,
                        Creater = "System"
                    };
                    _inventoryBatchRepository.AddData(inventory_Batch);
                }
                else
                {
                    inventory_Batch.BoxQuantity = inventory_Batch.BoxQuantity + inventoryInfo.BoxQuantity;
                    inventory_Batch.StockQuantity = inventory_Batch.StockQuantity + inventoryInfo.StockQuantity;
                    _inventoryBatchRepository.UpdateData(inventory_Batch);
                }
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
                _stockService.InventoryInfoService.Repository.UpdateData(inventoryInfo);
                Db.Ado.CommitTran();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
            }
            return content;
        }
        /// <summary>
        /// æ›´æ–°å…¥åº“任务状态完成
        /// </summary>
        /// <param name="WMStask"></param>
        /// <returns></returns>
        public WebResponseContent UpdateTaskStatusInFinish(Dt_Task task)