方舱智能密集库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
dengjunjie
7 天以前 bc43fe34a67fa68bcfb3a51b79308fad0be11c08 
 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs


@@ -35,19 +35,19 @@


    public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices


    {


        private readonly ICabinOrderServices _cabinOrderServices;


        private readonly IBasicService _basicService;


        private readonly IUnitOfWorkManage _unitOfWorkManage;


        private readonly IInventory_BatchServices _inventory_BatchServices;


        private readonly ILocationInfoService _locationInfoService;


        private readonly IInventoryInfoService _inventoryInfoService;


        private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;


        private readonly ISupplyTaskService _supplyTaskService;


        private readonly ISupplyTaskHtyService _supplyTaskHtyService;


        private readonly ITacticsService _tacticsService;


        private readonly IMaterielInfoService _materielInfoService;


        private readonly IMessageInfoService _messageInfoService;


        public IRepository<Dt_DeliveryOrder> Repository => BaseDal;


        public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService) : base(BaseDal)


        public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService, IMaterielInfoService materielInfoService, ILocationInfoService locationInfoService) : base(BaseDal)


        {


            _basicService = basicService;


            _unitOfWorkManage = unitOfWorkManage;


            _deliveryOrderDetailServices = deliveryOrderDetailServices;


            _supplyTaskService = supplyTaskService;


@@ -57,6 +57,8 @@


            _tacticsService = tacticsService;


            _supplyTaskHtyService = supplyTaskHtyService;


            _messageInfoService = messageInfoService;


            _materielInfoService = materielInfoService;


            _locationInfoService = locationInfoService;


        }


        #region åˆ›å»ºå‡ºåº“单


        /// <summary>


@@ -69,6 +71,7 @@


            WebResponseContent webResponseContent = new WebResponseContent();


            try


            {


                _unitOfWorkManage.BeginTran();


                Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "出库策略");


                #region ç‰¹æ®Šåº“房出库


                string WareCodeMJ = WarehouseEnum.麻精库.ObjToInt().ToString("000");


@@ -96,7 +99,7 @@


                            Status = 2, // pad平库，无需同步


                        }).ToList()


                    };


                    BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();


                    BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();


                    #endregion


                    #region å¤„理库存、库存批次、添加出库任务


                    List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();


@@ -223,7 +226,7 @@


                        #endregion


                        var Order_qty = Math.Abs(detail.order_qty);//出库单数量


                        #region æ ¹æ®ç‰©æ–™ç¼–码查询物料信息


                        Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no);


                        Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no);


                        if (materielInfo == null) throw new Exception($"未找到药品编码【{detail.goods_no}】的信息");


                        if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))


                            throw new Exception($"请设置药品编号【{detail.goods_no}】的属性分类");


@@ -446,15 +449,17 @@


                        }


                    }


                    if (entityOrder.Details.Count > 0)


                        BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();


                        BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();


                    if (entityOrderLK.Details.Count > 0)


                        BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();


                        BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();


                    #endregion


                }


                _unitOfWorkManage.CommitTran();


                webResponseContent.OK();


            }


            catch (Exception ex)


            {


                _unitOfWorkManage.RollbackTran();


                webResponseContent.Error(ex.Message);


            }


            return webResponseContent;


@@ -467,6 +472,7 @@


            WebResponseContent content = new WebResponseContent();


            try


            {


                _unitOfWorkManage.BeginTran();


                string WareCodeMJ = WarehouseEnum.麻精库.ObjToInt().ToString("000");


                string WareCodeLD = WarehouseEnum.冷冻库.ObjToInt().ToString("000");


                #region ç‰¹æ®Šåº“房


@@ -723,12 +729,15 @@


                            //Repository.AddData(entityOrder);


                            #endregion


                        }


                        return WebResponseContent.Instance.OK("成功");


                        //return WebResponseContent.Instance.OK("成功");


                    }


                }


                _unitOfWorkManage.CommitTran();


                return WebResponseContent.Instance.OK("成功");


            }


            catch (Exception ex)


            {


                _unitOfWorkManage.RollbackTran();


                content.Error(ex.Message);


            }


            return content;


@@ -743,7 +752,7 @@


            try


            {


                // 1️⃣ æŸ¥æ‰¾æŒ‡å®šæ‰¹æ¬¡ä¸Žç‰©æ–™çš„库存信息


                var batchInfo = BaseDal.Db.Queryable<Dt_Inventory_Batch>()


                var batchInfo = BaseDal.Db.CopyNew().Queryable<Dt_Inventory_Batch>()


                    .Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)


                    .First();




@@ -885,12 +894,12 @@


            WebResponseContent content = new WebResponseContent();


            try


            {


                Dt_DeliveryOrder? cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();


                Dt_DeliveryOrder? cabinOrder = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();


                if (cabinOrder == null) return WebResponseContent.Instance.Error($"出库单已完成");




                Dt_DeliveryOrderDetail? cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).FirstOrDefault();


                if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"出库单明细已完成");


                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);


                Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);


                if (materielInfo == null) return WebResponseContent.Instance.Error($"请维护物料编号【{cabinOrderDetail.Goods_no}】的物料信息");


                cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;


                if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)


@@ -909,7 +918,7 @@


                    //_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.自动完成);


                }


                _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);


                var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();


                var cabinOrder1 = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();


                if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "已完成").Any())


                    cabinOrder.OutStatus = "已完成";


                Repository.UpdateData(cabinOrder);


@@ -929,7 +938,7 @@


                #region è´§ä½


                if (supplyTask.WarehouseCode != WarehouseEnum.立库.ObjToInt().ToString("000"))


                {


                    var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);


                    var location = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);


                    if (location == null)


                        return WebResponseContent.Instance.Error($"请维护货位编号【{supplyTask.LocationCode}】的货位信息");


                    //if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())


@@ -938,7 +947,7 @@


                    if (inventoryInfo1 == null)


                    {


                        location.LocationStatus = LocationStatusEnum.Free.ObjToInt();


                        _basicService.LocationInfoService.UpdateData(location);


                        _locationInfoService.UpdateData(location);


                    }


                }


                #endregion


@@ -966,7 +975,7 @@


                if (supplyTask.WarehouseCode == WarehouseEnum.立库.ObjToInt().ToString("000"))


                {


                    materielInfo.Business_qty -= supplyTask.StockQuantity;


                    _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);


                    _materielInfoService.UpdateData(materielInfo);


                    if (materielInfo.Business_qty < materielInfo.MinQty)


                        CreateAllocatInOut(materielInfo);//创建调拨任务


                }