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


@@ -35,7 +35,6 @@


{


    public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices


    {


        private readonly IBasicService _basicService;


        private readonly IMedicineGoodsServices _medicineGoodsServices;


        private readonly IUnitOfWorkManage _unitOfWorkManage;


        private readonly IInventory_BatchServices _inventory_BatchServices;


@@ -43,12 +42,13 @@


        private readonly ICabinOrderDetailServices _cabinOrderDetailServices;


        private readonly ISupplyTaskService _supplyTaskService;


        private readonly ISupplyTaskHtyService _supplyTaskHtyService;


        private readonly ILocationInfoService _locationInfoService;


        private readonly IMaterielInfoService _materielInfoService;


        private readonly IMessageInfoService _messageInfoService;


        public IRepository<Dt_CabinOrder> Repository => BaseDal;




        public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService) : base(BaseDal)


        public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService, IMaterielInfoService materielInfoService, ILocationInfoService locationInfoService) : base(BaseDal)


        {


            _basicService = basicService;


            _medicineGoodsServices = medicineGoodsServices;


            _unitOfWorkManage = unitOfWorkManage;


            _inventory_BatchServices = inventory_BatchServices;


@@ -57,12 +57,14 @@


            _supplyTaskService = supplyTaskService;


            _supplyTaskHtyService = supplyTaskHtyService;


            _messageInfoService = messageInfoService;


            _materielInfoService = materielInfoService;


            _locationInfoService = locationInfoService;


        }








        /// <summary>


        /// pda查询出库单信息


        /// pda查询入库单信息


        /// </summary>


        /// <param name="saveModel"></param>


        /// <returns></returns>


@@ -132,7 +134,7 @@


                Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).FirstOrDefault();


                if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "已完成")


                    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_Inqty += Inqty;


                if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)


@@ -155,7 +157,7 @@


                #endregion




                #region è´§ä½


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


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


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


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


                    return WebResponseContent.Instance.Error($"货位编号【{LocationCode}】已禁用，请恢复正常再使用");


@@ -164,7 +166,7 @@


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


                {


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


                    _basicService.LocationInfoService.UpdateData(location);


                    _locationInfoService.UpdateData(location);


                }


                #endregion




@@ -270,7 +272,7 @@


                        Status = false,


                        StockQuantity = inventoryInfo.StockQuantity,


                        AvailableQuantity = inventoryInfo.StockQuantity,


                        ValidityPeriod = inventoryInfo.ValidityPeriod,


                        ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),


                        SupplyQuantity = inventoryInfo.SupplyQuantity,


                    };


                    _inventory_BatchServices.AddData(inventory_Batch);


@@ -316,6 +318,7 @@


                        Warehouse_no = order.warehouse_no,


                        Details = order.details.Select(d => new Dt_CabinOrderDetail


                        {


                            Reservoirarea = order.warehouse_no,


                            Goods_no = d.goods_no,


                            Order_qty = Math.Abs(d.order_qty),


                            Batch_num = d.batch_num,


@@ -357,12 +360,10 @@


                        // å°†ä¸Šæ¸¸å…¥åº“数量转为正数


                        item.order_qty = Math.Abs(item.order_qty);


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


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


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


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


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


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


                        if (materielInfo.BoxQty < 1) throw new Exception($"请设置药品编号【{item.goods_no}】的箱规数量");


                        if (materielInfo.MinQty < 1) throw new Exception($"请设置药品编号【{item.goods_no}】的立库最低库存数");


                        #endregion


                        #region å¤§ä»¶


                        if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//如果物料是大件


@@ -382,6 +383,8 @@


                        #endregion


                        else


                        {


                            if (materielInfo.BoxQty < 1) throw new Exception($"请设置药品编号【{item.goods_no}】的箱规数量");


                            if (materielInfo.MinQty < 1) throw new Exception($"请设置药品编号【{item.goods_no}】的立库最低库存数");


                            Dt_CabinOrderDetail orderDetail = null;


                            var ys = item.order_qty % materielInfo.BoxQty; //不能整除箱规的散件数 


                            var xs = (int)(item.order_qty / materielInfo.BoxQty);//保留整数


@@ -447,7 +450,7 @@


                            }


                            #endregion


                        }


                        _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);


                        _materielInfoService.UpdateData(materielInfo);


                    }


                    if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);


                    if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);


@@ -739,6 +742,12 @@


        }


        #endregion






        /// <summary>


        /// äººå·¥å…¥åº“完成


        /// </summary>


        /// <param name="key"></param>


        /// <returns></returns>


        public WebResponseContent FinishInOrder(int key)


        {


            WebResponseContent content = new WebResponseContent();


@@ -747,6 +756,7 @@


                Dt_CabinOrder cabinOrder = BaseDal.QueryFirst(x => x.Id == key);


                List<Dt_CabinOrder> cabinOrders = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).ToList();//找出所有出库单号相同的出库单


                _unitOfWorkManage.BeginTran();




                foreach (var item in cabinOrders)


                {


                    if (item.Details != null)


@@ -756,16 +766,22 @@


                    item.Details = null;


                }


                BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.人工完成);


                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";


                var requestDate = new




                if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())


                    _unitOfWorkManage.CommitTran();


                else


                {


                    order_no = cabinOrder.Order_no


                };


                var result = HttpHelper.Post(url, requestDate.ToJsonString());


                var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);


                if (response == null) throw new Exception("上报ERP入库单完成失败！");


                if (response.resultCode != "0") throw new Exception(response.resultMsg);


                _unitOfWorkManage.CommitTran();


                    var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";


                    var requestDate = new


                    {


                        order_no = cabinOrder.Order_no


                    };


                    var result = HttpHelper.Post(url, requestDate.ToJsonString());


                    var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);


                    if (response == null) throw new Exception("上报ERP入库单完成失败！");


                    if (response.resultCode != "0") throw new Exception(response.resultMsg);


                    _unitOfWorkManage.CommitTran();


                }


                content.OK();


            }


            catch (Exception ex)