美瑞安淮安立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
wangxinhui
2025-01-12 2f14ad3cc01d575bfde0850bae05fded8acb7af6 
 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs


@@ -43,9 +43,11 @@


        public IOutboundOrderRepository Repository => BaseDal;


        private readonly IInvokeERPService _invokeERPService;


        private readonly IOutStockLockInfoService _outStockLockInfoService;


        private readonly IOutboundOrderRepository _outboundOrderRepository;




        public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper,IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService,


          IStockInfoRepository stockInfoRepository, IInvokeERPService invokeERPService, IOutStockLockInfoService outStockLockInfoService) : base(BaseDal)


        public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService,


          IStockInfoRepository stockInfoRepository, IInvokeERPService invokeERPService, IOutStockLockInfoService outStockLockInfoService,


          IOutboundOrderRepository outboundOrderRepository) : base(BaseDal)


        {


            _mapper = mapper;


            _unitOfWorkManage = unitOfWorkManage;


@@ -55,8 +57,47 @@


            _stockInfoRepository = stockInfoRepository;


            _invokeERPService = invokeERPService;


            _outStockLockInfoService = outStockLockInfoService;


            _outboundOrderRepository = outboundOrderRepository;


        }


        public override WebResponseContent AddData(SaveModel saveModel)


        {


            if (saveModel.MainData.TryGetValue(nameof(Dt_OutboundOrder.UpperOrderNo).FirstLetterToLower(), out object? upperOrderNo) && upperOrderNo != null && !string.IsNullOrEmpty(upperOrderNo.ToString()))


            {


                Dt_OutboundOrder outboundOrder = BaseDal.QueryFirst(x => x.UpperOrderNo == upperOrderNo.ToString() && x.WarehouseId == Convert.ToInt32(saveModel.MainData[nameof(Dt_OutboundOrder.WarehouseId).FirstLetterToLower()]));


                if (outboundOrder != null)


                {


                    return WebResponseContent.Instance.Error($"{upperOrderNo}领料单号已存在");


                }


            }


            saveModel.DetailData[0].Add("orderDetailStatus", OrderDetailStatusEnum.New.ObjToInt());


            return base.AddData(saveModel);


        }


        public WebResponseContent GetOutboundOrders(SaveModel saveModel)


        {


            WebResponseContent content = new WebResponseContent();


            try


            {


                int pageNo = saveModel.MainData["pageNo"].ObjToInt();


                string? orderNo = saveModel.MainData["orderNo"].ToString();


                int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();


                List<Dt_OutboundOrder> dt_ReceiveOrders = new List<Dt_OutboundOrder>();


                if (string.IsNullOrEmpty(orderNo))


                {


                    dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutLockStockStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);


                }


                else


                {


                    dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutLockStockStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);


                }




                content.OK(data: dt_ReceiveOrders);


            }


            catch (Exception ex)


            {


                content.Error(ex.Message);


            }


            return content;


        }


        public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)


        {


            try


@@ -112,10 +153,10 @@


                            MaterielName = materielInfo.MaterielName,


                            OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),


                            OrderQuantity = model.Qty,


                            Unit = materielInfo.MaterielUnit


                        };


                        Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder()


                        {


                            OrderNo=model.OrderNo,


                            UpperOrderNo = model.OrderNo,


                            OrderStatus = OutOrderStatusEnum.未开始.ObjToInt(),


                            OrderType = OutOrderTypeEnum.Issue.ObjToInt(),


@@ -172,106 +213,136 @@


            }


        }


        //上报出库完成


        public WebResponseContent TestOutUpload(int id,Dt_StockInfo stockInfo)


        public WebResponseContent TestOutUpload(int id, List<Dt_OutStockLockInfo>? outStockLockInfos)


        {


            try


            {


                Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x=>x.Id==id).Includes(x=>x.Details).First();


                Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First();


                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == outboundOrder.WarehouseId);


                ERPIssueModel issueModel = new ERPIssueModel();


                List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();


                //测试架库给ERP上报出库完成


                if (stockInfo==null)


                List<Dt_OutStockLockInfo> _OutStockLockInfos = new List<Dt_OutStockLockInfo>();


                int overCount = outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();


                if (outboundOrder.Details.Count == overCount)


                {


                    stockInfos = TestOutStocksUpdate(warehouse).Data as List<Dt_StockInfo> ?? new List<Dt_StockInfo>();


                    List<ERPPickItemModel> eRPOutPick =new List<ERPPickItemModel>();


                    for (int i = 0; i < stockInfos.Count; i++)


                    outboundOrder.OrderStatus = OutOrderStatusEnum.出库完成.ObjToInt();


                    _outboundOrderRepository.UpdateData(outboundOrder);


                }


                if (outboundOrder == null)


                {


                    return WebResponseContent.Instance.Error("出库单不存在");


                }


                if (outboundOrder.CreateType == OrderCreateTypeEnum.CreateInSystem.ObjToInt())


                {


                    return WebResponseContent.Instance.OK();


                }


                //测试架库给ERP上报出库完成


                if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())


                {


                    List<ERPPickModel> eRPPicks = new List<ERPPickModel>();


                    foreach (var item in outboundOrder.Details)


                    {


                        if (item.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) continue;


                        stockInfos = TestOutStocksUpdate(warehouse, item).Data as List<Dt_StockInfo> ?? null;


                        if (stockInfos == null) continue;


                        List<ERPPickItemModel> eRPOutPick = new List<ERPPickItemModel>();


                        for (int i = 0; i < stockInfos.Count; i++)


                        {


                            ERPPickItemModel pickItemModel = new ERPPickItemModel()


                            {


                                Lotno = stockInfos[i].Details[0].BatchNo,


                                Qty = stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(),


                                Location = warehouse.WarehouseCode


                            };


                            eRPOutPick.Add(pickItemModel);


                        }




                        ERPPickModel pickModel = new ERPPickModel()


                        {


                            Rowindex = item.RowNo,


                            Material = item.MaterielCode,


                            Qty = (item.OrderQuantity.ObjToInt()).ToString(),


                            Dataitem = eRPOutPick


                        };


                        eRPPicks.Add(pickModel);


                    }


                    ERPIssueItemModel issueItemModel = new ERPIssueItemModel()


                    {


                        Pickcode = outboundOrder.UpperOrderNo,


                        PickList = eRPPicks


                    };


                    issueModel = new ERPIssueModel()


                    {


                        UniqueTag = id.ToString(),


                        Code = outboundOrder.OrderNo,//测试


                        WarehouseCode = warehouse.WarehouseCode,


                        Docremark = "",


                        Deptno = outboundOrder.DepartmentCode,


                        Deptname = outboundOrder.DepartmentName,


                        Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),


                        Createuser = outboundOrder.Creater,


                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },


                    };


                }


                else


                {


                    List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();




                    //获取出库详情单


                    foreach (var item in outStockLockInfos)


                    {


                        ERPPickItemModel pickItemModel = new ERPPickItemModel()


                        {


                            Lotno= stockInfos[i].Details[0].BatchNo,


                            Qty= stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(),


                            Location= warehouse.WarehouseCode


                            Lotno = item.BatchNo,


                            Qty = item.AssignQuantity.ObjToInt().ToString(),


                            Location = warehouse.WarehouseCode


                        };


                        eRPOutPick.Add(pickItemModel);


                        //获取出库单明细


                        Dt_OutboundOrderDetail outboundOrderDetail = outboundOrder.Details.FirstOrDefault(x => x.Id == item.OrderDetailId);


                        ERPPickModel pickModel = new ERPPickModel()


                        {


                            Rowindex = outboundOrderDetail.RowNo,


                            Material = outboundOrderDetail.MaterielCode,


                            Qty = pickItemModel.Qty,


                            Dataitem = new List<ERPPickItemModel> { pickItemModel }


                        };


                        if (item.OrderQuantity == item.AssignQuantity)


                        {


                            item.Status = OutLockStockStatusEnum.出库完成.ObjToInt();


                        }


                        eRPPickModels.Add(pickModel);


                        _OutStockLockInfos.Add(item);


                    }


                    


                    ERPPickModel pickModel = new ERPPickModel()


                    ERPIssueItemModel issueItemModel = new ERPIssueItemModel()


                    {


                        Rowindex = outboundOrder.Details[0].RowNo,


                        Material = outboundOrder.Details[0].MaterielCode,


                        Qty = (outboundOrder.Details[0].OrderQuantity.ObjToInt()).ToString(),


                        Dataitem = eRPOutPick


                        Pickcode = outboundOrder.UpperOrderNo,


                        PickList = eRPPickModels


                    };


                    issueModel = new ERPIssueModel()


                    {


                        UniqueTag = id.ToString(),


                        Code = outboundOrder.OrderNo,


                        WarehouseCode = warehouse.WarehouseCode,


                        Docremark = "",


                        Deptno = outboundOrder.DepartmentCode,


                        Deptname = outboundOrder.DepartmentName,


                        Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),


                        Createuser = outStockLockInfos.FirstOrDefault().Creater,


                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },


                    };


                }




                    ERPIssueItemModel issueItemModel = new ERPIssueItemModel()


                    {


                        Pickcode = outboundOrder.UpperOrderNo,


                        PickList = new List<ERPPickModel>() { pickModel }


                    };


                    issueModel = new ERPIssueModel()


                    {


                        UniqueTag = id.ToString(),


                        Code = outboundOrder.OrderNo,//测试


                        WarehouseCode = warehouse.WarehouseCode,


                        Docremark = "",


                        Deptno = outboundOrder.DepartmentCode,


                        Deptname = outboundOrder.DepartmentName,


                        Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),


                        Createuser = outboundOrder.Creater,


                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },


                    };


                if (stockInfos.Count > 0)


                {


                    _stockInfoRepository.UpdateData(stockInfos);


                }


                else


                {


                    Dt_OutboundOrderDetail orderDetail = outboundOrder.Details.FirstOrDefault(x => x.MaterielCode == stockInfo.Details[0].MaterielCode);


                    


                    ERPPickItemModel pickItemModel = new ERPPickItemModel()


                    {


                        Lotno = stockInfo.Details[0].BatchNo,


                        Qty = stockInfo.Details[0].StockQuantity.ObjToInt().ToString(),


                        Location = stockInfo.LocationCode


                    };


                    ERPPickModel pickModel = new ERPPickModel()


                    {


                        Rowindex = outboundOrder.Details[0].RowNo,


                        Material = outboundOrder.Details[0].MaterielCode,


                        Qty = (outboundOrder.Details[0].OrderQuantity.ObjToInt()).ToString(),


                        Dataitem = new List<ERPPickItemModel> { pickItemModel }


                    };


                    ERPIssueItemModel issueItemModel = new ERPIssueItemModel()


                    {


                        Pickcode = outboundOrder.UpperOrderNo,


                        PickList = new List<ERPPickModel>() { pickModel }


                    };


                    issueModel = new ERPIssueModel()


                    {


                        UniqueTag = id.ToString(),


                        Code = outboundOrder.OrderNo,//测试


                        WarehouseCode = warehouse.WarehouseCode,


                        Docremark = "",


                        Deptno = outboundOrder.DepartmentCode,


                        Deptname = outboundOrder.DepartmentName,


                        Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),


                        Createuser = outboundOrder.Creater,


                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },


                    };


                    _outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);


                }


                


                string response = _invokeERPService.InvokeOutStandardsApi(issueModel);


                ErpRequestContent requestContent = response.DeserializeObject<ErpRequestContent>();


                if (requestContent.res == 1)


                {


                    if (stockInfos.Count>0)


                    {


                        _stockInfoRepository.UpdateData(stockInfos);


                    }


                    return WebResponseContent.Instance.OK(requestContent.Data);


                }


                else


                {


                    return WebResponseContent.Instance.Error(requestContent.Data);


                }


                //出库完成上报ERP æµ‹è¯•æ³¨é‡Š


                _invokeERPService.InvokeOutStandardsApi(issueModel);


                return WebResponseContent.Instance.OK();


            }


            catch (Exception ex)


            {


@@ -284,15 +355,15 @@


        /// <param name="warehouse"></param>


        /// <param name="model"></param>


        /// <returns></returns>


        public WebResponseContent TestOutStocksUpdate(Dt_Warehouse warehouse)


        public WebResponseContent TestOutStocksUpdate(Dt_Warehouse warehouse,Dt_OutboundOrderDetail outboundOrderDetails)


        {


            try


            {


                //获取出库单库存


                List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).ToList();


                if (stockInfos.Count<=0)


                List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x=>x.Details.Any(j=>j.MaterielCode== outboundOrderDetails.MaterielCode)).Take((int)outboundOrderDetails.OrderQuantity).ToList();


                if (stockInfos.Count <= 0)


                {


                    return WebResponseContent.Instance.Error($"库存不足");


                    return WebResponseContent.Instance.OK();


                }


                //更改状态


                stockInfos.ForEach(x =>