修改WCS、WMS出入库逻辑

dengjunjie

2024-11-14 c827fe7b0c5b3b444d76ba0d96a2649c764630dd

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs

@@ -33,11 +33,94 @@
        /// <returns></returns>
        public Dt_InboundOrder GetInboundOrder(string inboundOrderNo)
        {
            return BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).First(x => x.OrderNo == inboundOrderNo); ;
            return BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).First(x => x.OrderNo == inboundOrderNo);
        }
        /// <summary>
        /// PDA组盘
        /// å•ç§ç‰©æ–™ç»„盘
        /// </summary>
        /// <param name="pdaMaterielGroupDTO"></param>
        /// <returns></returns>
        public WebResponseContent PdaAddStockInfo(PdaMaterielGroupDTO pdaMaterielGroupDTO)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.GetMaterielInfo(pdaMaterielGroupDTO.MaterielCode);

                Dt_InboundOrder inboundOrder = GetInboundOrder(pdaMaterielGroupDTO.OrderNo);

                Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(pdaMaterielGroupDTO.PalletCode);

                var result = CheckMaterielGroupParam(pdaMaterielGroupDTO, materielInfo, inboundOrder, stockInfo);
                if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);

                if (stockInfo == null)
                {
                    stockInfo = new Dt_StockInfo();
                    stockInfo.Details = new List<Dt_StockInfoDetail>();
                }
                var stockInfoDetail = stockInfo.Details.Where(x => pdaMaterielGroupDTO.MaterielCode == x.MaterielCode && x.BatchNo == pdaMaterielGroupDTO.BatchNo).FirstOrDefault();
                if (stockInfoDetail == null)
                {
                    stockInfoDetail = new Dt_StockInfoDetail()
                    {
                        Status = StockStatusEmun.组盘暂存.ObjToInt(),
                        OrderNo = inboundOrder.OrderNo,
                        StockId = stockInfo.Id != 0 ? stockInfo.Id : 0,
                        MaterielName = materielInfo.MaterielName,
                        MaterielCode = materielInfo.MaterielCode,
                        BatchNo = pdaMaterielGroupDTO.BatchNo,
                        StockQuantity = pdaMaterielGroupDTO.ReceiptQuantity,
                        SerialNumber = $"{inboundOrder.OrderNo} | {materielInfo.MaterielCode} | {pdaMaterielGroupDTO.BatchNo} | {pdaMaterielGroupDTO.ReceiptQuantity}",
                        Creater = "System"
                    };
                    if (stockInfo.Id == 0)
                    {
                        stockInfo.PalletCode = pdaMaterielGroupDTO.PalletCode;
                        stockInfo.StockStatus = StockStatusEmun.组盘暂存.ObjToInt();
                        stockInfo.Creater = "System";
                    }
                    stockInfo.Details.Add(stockInfoDetail);
                }
                else
                {
                    stockInfoDetail.StockQuantity += pdaMaterielGroupDTO.ReceiptQuantity;
                    stockInfoDetail.SerialNumber = $"{inboundOrder.OrderNo} | {materielInfo.MaterielCode} | {pdaMaterielGroupDTO.BatchNo} | {(int)stockInfoDetail.StockQuantity}";
                }
                 

                Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.Where(x => materielInfo.MaterielCode == x.MaterielCode && x.BatchNo == pdaMaterielGroupDTO.BatchNo).FirstOrDefault();//订单详情

                inboundOrderDetail.ReceiptQuantity++;
                inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt();

                if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null)
                {
                    inboundOrder.OrderStatus = InboundStatusEnum.入库完成.ObjToInt();
                }
                else if (inboundOrder.OrderStatus == InboundStatusEnum.未开始.ObjToInt())
                {
                    inboundOrder.OrderStatus = InboundStatusEnum.入库中.ObjToInt();
                }

                _unitOfWorkManage.BeginTran();
                UpdateData(inboundOrder);
                _inboundOrderDetailService.UpdateData(inboundOrderDetail);
                _stockService.StockInfoService.AddMaterielGroup(stockInfo);
                _unitOfWorkManage.CommitTran();
                content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
        }

        /// <summary>
        /// ç»„盘
        /// MES下发组盘
        /// </summary>
        /// <param name="materielGroupDTO"></param>
        /// <returns></returns>
@@ -71,7 +154,7 @@
                List<Dt_StockInfoDetail> stockInfoDetails = _mapper.Map<List<Dt_StockInfoDetail>>(matSerialNumberDTOs);
                stockInfoDetails.ForEach(x =>
                {
                    x.Status = 0;
                    x.Status = StockStatusEmun.组盘暂存.ObjToInt();
                    x.OrderNo = inboundOrder.OrderNo;
                    x.MaterielName = materielInfos.FirstOrDefault(v => v.MaterielCode == x.MaterielCode)?.MaterielName ?? "";
                    x.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0;
@@ -136,6 +219,54 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// éªŒè¯PDA组盘数据
        /// </summary>
        /// <param name="materielGroupDTO"></param>
        /// <param name="materielInfo"></param>
        /// <param name="inboundOrder"></param>
        /// <param name="stockInfo"></param>
        /// <returns></returns>
        public (bool, string, object?) CheckMaterielGroupParam(PdaMaterielGroupDTO materielGroupDTO, Dt_MaterielInfo materielInfo, Dt_InboundOrder inboundOrder, Dt_StockInfo? stockInfo)
        {
            if (_taskRepository.QueryFirst(x => x.PalletCode == materielGroupDTO.PalletCode) != null)
            {
                return (false, "该托盘号已有任务", materielGroupDTO);
            }
            if (stockInfo != null && !string.IsNullOrEmpty(stockInfo.LocationCode) && stockInfo.StockStatus != StockStatusEmun.组盘暂存.ObjToInt())
            {
                return (false, "已上架的托盘不能再次组盘", materielGroupDTO);
            }
            if (materielInfo == null)
            {
                return (false, "有物料信息未录入，请录入物料信息", materielGroupDTO);
            }
            if (inboundOrder == null)
            {
                return (false, "单据不存在", materielGroupDTO);
            }
            if (inboundOrder.Details == null || inboundOrder.Details.Count == 0)
            {
                return (false, "无单据明细信息", materielGroupDTO);
            }

            if (inboundOrder.OrderStatus != InboundStatusEnum.未开始.ObjToInt() && inboundOrder.OrderStatus != InboundStatusEnum.入库中.ObjToInt())
            {
                return (false, "该单据不可再组盘", materielGroupDTO);
            }

            Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.Where(x => materielInfo.MaterielCode == x.MaterielCode && x.BatchNo == materielGroupDTO.BatchNo).FirstOrDefault();
            if (inboundOrderDetail == null)
            {
                return (false, "物料或批次号有误", materielGroupDTO);
            }
            if (inboundOrderDetail.OrderQuantity - inboundOrderDetail.ReceiptQuantity < 1)
            {
                //return (false, "有物料超出单据数量", materielGroupDTO);
                return (false, "组盘超出单据数量", materielGroupDTO);
            }
            return (true, "成功", inboundOrderDetail);
        }

        /// <summary>
        /// éªŒè¯ç»„盘数据