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


@@ -21,6 +21,7 @@


using WIDESEA_Core.BaseServices;


using WIDESEA_Core.Enums;


using WIDESEA_Core.Helper;


using WIDESEA_DTO.Outbound;


using WIDESEA_DTO.SquareCabin;


using WIDESEA_IBasicService;


using WIDESEA_ISquareCabinServices;


@@ -35,19 +36,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,7 +58,145 @@


            _tacticsService = tacticsService;


            _supplyTaskHtyService = supplyTaskHtyService;


            _messageInfoService = messageInfoService;


            _materielInfoService = materielInfoService;


            _locationInfoService = locationInfoService;


        }


        public override WebResponseContent UpdateData(SaveModel saveModel)


        {


            try


            {


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


                var warehouse_no = saveModel.MainData["warehouse_no"].ToString();


                var out_no = saveModel.MainData["out_no"].ToString();


                //OutboundOrderAddDTO outboundOrder = saveModel.MainData.DicToModel<OutboundOrderAddDTO>();


                //Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == id);


                List<DeliveryOrderDetailAddDTO> orderDetailAddDTOs = saveModel.DetailData.DicToIEnumerable<DeliveryOrderDetailAddDTO>();


                orderDetailAddDTOs = orderDetailAddDTOs.Where(x => x.id == 0).ToList();


                if (orderDetailAddDTOs.Count < 1) return WebResponseContent.Instance.OK();


                if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.locationCode)).Any()) return WebResponseContent.Instance.Error("货位号为必填字段!");


                if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.exp_date)).Any()) return WebResponseContent.Instance.Error("效期为必填字段!");


                var LocationCodes = orderDetailAddDTOs.Select(x => x.locationCode);


                List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && LocationCodes.Contains(x.LocationCode));


                var diff = LocationCodes.Except(locationInfos.Select(x => x.LocationCode)).ToArray();


                if (diff.Length > 0) return WebResponseContent.Instance.Error($"货位编号【{string.Join(", ", diff)}】不属于当前库房");


                var array1 = orderDetailAddDTOs.Select(x => x.goods_no);


                var MaterielInfos = _materielInfoService.Repository.QueryData(x => array1.Contains(x.MaterielCode));


                var array2 = MaterielInfos.Select(x => x.MaterielCode);


                diff = array1.Except(array2).ToArray();


                if (diff.Length > 0) return WebResponseContent.Instance.Error($"请维护物料编号【{string.Join(", ", diff)}】的物料信息");


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


                {


                    var MaterielInfos1 = MaterielInfos.Where(x => x.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart).ToList();


                    if (MaterielInfos1.Count > 0)


                    {


                        return WebResponseContent.Instance.Error($"物料编号【{string.Join(", ", MaterielInfos1.Select(x => x.MaterielCode))}】的物料属性分类为大件，不可入立库");


                    }


                }


                var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && array2.ToList().Contains(x.MaterielCode));


                var Batchs = _inventory_BatchServices.Repository.QueryData(x => array2.Contains(x.MaterielCode));


                List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();


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


                List<Dt_InventoryInfo> inventoryInfos = new List<Dt_InventoryInfo>();


                List<Dt_Inventory_Batch> inventory_Batches = new List<Dt_Inventory_Batch>();


                foreach (var item in orderDetailAddDTOs)


                {


                    if (InventoryInfos.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).Any())


                        return WebResponseContent.Instance.Error($"物料编号【{item.goods_no}】物料批次【{item.batch_num}】已存在库存");


                    #region æ·»åŠ ç›˜ç‚¹å•è¯¦æƒ…


                    Dt_DeliveryOrderDetail dt_DeliveryOrde = new Dt_DeliveryOrderDetail()


                    {


                        DeliveryOrderId = id,


                        Reservoirarea = warehouse_no,


                        Status = 2,


                        Order_qty = 0,


                        Order_Outqty = item.order_Outqty,


                        Goods_no = item.goods_no,


                        OotDetailStatus = "新建",


                        Batch_num = item.batch_num,


                        Creater = App.User.UserName,


                        CreateDate = DateTime.Now,


                    };


                    deliveryOrderDetails.Add(dt_DeliveryOrde);


                    #endregion




                    #region æ·»åŠ åº“存、批次信息、盘点任务


                    var MaterielInfo = MaterielInfos.First(x => x.MaterielCode == item.goods_no);


                    Dt_InventoryInfo inventoryInfo = new Dt_InventoryInfo()


                    {


                        BatchNo = item.batch_num,


                        MaterielCode = MaterielInfo.MaterielCode,


                        AvailableQuantity = 0,


                        CreateDate = DateTime.Now,


                        Creater = App.User.UserName,


                        InDate = DateTime.Now,


                        LocationCode = item.locationCode,


                        MaterielName = MaterielInfo.MaterielName,


                        MaterielSpec = MaterielInfo.MaterielSpec,


                        OutboundQuantity = 0,


                        StockQuantity = 0,


                        StockStatus = StockStatusEmun.盘点锁定.ObjToInt(),


                        SupplyQuantity = 0,


                        WarehouseCode = warehouse_no,


                        ValidityPeriod = item.exp_date


                    };


                    inventoryInfos.Add(inventoryInfo);


                    Dt_Inventory_Batch? inventory_Batch = Batchs.FirstOrDefault(x => x.BatchNo == item.batch_num && x.MaterielCode == item.goods_no);


                    if (inventory_Batch == null)


                    {


                        inventory_Batch = new Dt_Inventory_Batch()


                        {


                            BatchNo = inventoryInfo.BatchNo,


                            CreateDate = inventoryInfo.CreateDate,


                            Creater = inventoryInfo.Creater,


                            MaterielCode = inventoryInfo.MaterielCode,


                            ERPStockQuantity = 0,


                            MaterielName = inventoryInfo.MaterielName,


                            MaterielSpec = inventoryInfo.MaterielSpec,


                            OutboundQuantity = inventoryInfo.OutboundQuantity,


                            ProductionDate = inventoryInfo.ProductionDate,


                            Status = false,


                            StockQuantity = inventoryInfo.StockQuantity,


                            AvailableQuantity = inventoryInfo.AvailableQuantity,


                            ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),


                            SupplyQuantity = inventoryInfo.SupplyQuantity,


                        };


                        inventory_Batches.Add(inventory_Batch);


                    }


                    Dt_SupplyTask supplyTask = new Dt_SupplyTask()


                    {


                        WarehouseCode = warehouse_no,


                        TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),


                        BatchNo = inventoryInfo.BatchNo,


                        MaterielName = inventoryInfo.MaterielName,


                        MaterielCode = inventoryInfo.MaterielCode,


                        MaterielSpec = inventoryInfo.MaterielSpec,


                        TaskType = TaskTypeEnum.OutInventory.ObjToInt(),


                        CreateDate = DateTime.Now,


                        Creater = App.User.UserName,


                        LocationCode = inventoryInfo.LocationCode,


                        OrderNo = out_no,


                        StockQuantity = inventoryInfo.StockQuantity,


                        SupplyQuantity = 0,


                        Remark = "盘点"


                    };


                    supplyTasks.Add(supplyTask);


                    #endregion


                }


                _unitOfWorkManage.BeginTran();


                _deliveryOrderDetailServices.AddData(deliveryOrderDetails);


                _inventoryInfoService.AddData(inventoryInfos);


                if (inventory_Batches.Count > 0) _inventory_BatchServices.AddData(inventory_Batches);


                _supplyTaskService.AddData(supplyTasks);


                _unitOfWorkManage.CommitTran();


                return WebResponseContent.Instance.OK("盘点详情添加成功,请通过ERP平账！");


            }


            catch (Exception ex)


            {


                _unitOfWorkManage.RollbackTran();


                return WebResponseContent.Instance.Error(ex.Message);


            }


        }




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


        /// <summary>


        /// åˆ›å»ºå‡ºåº“单


@@ -96,19 +235,22 @@


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


                        }).ToList()


                    };


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


                    #endregion


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


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


                    List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();


                    List<Dt_InventoryInfo> inventoryInfosUp = new List<Dt_InventoryInfo>();


                    var inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode));


                    var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode) && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == outorder.warehouse_no);


                    foreach (var item in entityOrder.Details)


                    {


                        Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num);


                        Dt_Inventory_Batch? inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num).FirstOrDefault();


                        if (inventory_Batch == null) throw new Exception($"未找到出库单号【{entityOrder.Out_no}】中物料编号【{item.Goods_no}】物料批次【{item.Batch_num}】的库存批次信息");


                        if (inventory_Batch.AvailableQuantity < item.Order_qty) throw new Exception($"出库单号【{entityOrder.Out_no}】中物料编号【{item.Goods_no}】物料批次【{item.Batch_num}】的库存批次信息可用数量不足");


                        inventory_Batch.AvailableQuantity -= item.Order_qty;


                        inventory_Batch.OutboundQuantity += item.Order_qty;


                        List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == item.Reservoirarea);


                        if (dt_InventoryInfos.Count < 1) throw new Exception($"出库单号【{entityOrder.Out_no}】中物料编号【{item.Goods_no}】物料批次【{item.Batch_num}】的库存当前状态不可出库");


                        List<Dt_InventoryInfo> dt_InventoryInfos = InventoryInfos.Where(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num).ToList();


                        if (dt_InventoryInfos.Count < 1) throw new Exception($"出库单号【{entityOrder.Out_no}】中物料编号【{item.Goods_no}】物料批次【{item.Batch_num}】的可用库存不足");


                        #region æŒ‰å‡ºåº“策略查找库存


                        if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())


                            dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();


@@ -167,11 +309,16 @@


                                supplyTasks.Add(supplyTask);


                                Order_qty = 0;


                            }


                            inventoryInfosUp.Add(InventoryInfo);


                        }


                        _inventory_BatchServices.Repository.UpdateData(inventory_Batch);


                        _inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);


                        batchesUp.Add(inventory_Batch);


                    }


                    _unitOfWorkManage.BeginTran();


                    _supplyTaskService.AddData(supplyTasks);


                    _inventory_BatchServices.UpdateData(batchesUp);


                    _inventoryInfoService.UpdateData(inventoryInfosUp);


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


                    _unitOfWorkManage.CommitTran();


                    #endregion


                }


                #endregion


@@ -204,16 +351,22 @@


                    };


                    #endregion


                    #region æŸ¥æ‰¾åº“å­˜


                    List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();


                    List<Dt_InventoryInfo> inventoryInfosUp = new List<Dt_InventoryInfo>();


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


                    List<Dt_MaterielInfo> materielInfos = _materielInfoService.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode));


                    var inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode));


                    var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode) && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.AvailableQuantity > 0 && (x.WarehouseCode == WareCodeDJ || x.WarehouseCode == WareCodeLK));


                    foreach (var detail in outorder.details)


                    {


                        #region æŸ¥è¯¢åº“存批次和库存


                        Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == detail.goods_no && x.BatchNo == detail.batch_num);


                        Dt_Inventory_Batch? inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == detail.goods_no && x.BatchNo == detail.batch_num).FirstOrDefault();


                        if (inventory_Batch == null) throw new Exception($"未找到出库单号【{outorder.order_no}】中物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】的库存批次信息");


                        if (inventory_Batch.AvailableQuantity < detail.order_qty) throw new Exception($"出库单号【{outorder.order_no}】中物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】的库存批次信息可用数量不足");


                        inventory_Batch.AvailableQuantity -= detail.order_qty;


                        inventory_Batch.OutboundQuantity += detail.order_qty;


                        List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo && x.AvailableQuantity > 0 && (x.WarehouseCode == WareCodeDJ || x.WarehouseCode == WareCodeLK));


                        if (dt_InventoryInfos.Count < 1) throw new Exception($"出库单号【{outorder.order_no}】中物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】的库存当前状态不可出库");


                        List<Dt_InventoryInfo> dt_InventoryInfos = InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();


                        if (dt_InventoryInfos.Count < 1) throw new Exception($"出库单号【{outorder.order_no}】中物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】的可用库存不足");


                        #endregion


                        #region æŒ‰å‡ºåº“策略查找库存


                        if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())


@@ -223,11 +376,10 @@


                        #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 = materielInfos.Where(x => x.MaterielCode == detail.goods_no).FirstOrDefault();


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


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


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


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


                        #endregion


                        #region å¤§ä»¶


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


@@ -247,7 +399,6 @@


                            entityOrder.Details.Add(orderDetail);


                            #endregion




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


                            #region è®¡ç®—库存、添加出库任务


                            foreach (var InventoryInfo in dt_InventoryInfos)


                            {


@@ -302,14 +453,16 @@


                                }


                            }


                            #endregion


                            _inventory_BatchServices.Repository.UpdateData(inventory_Batch);


                            _inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);


                            _supplyTaskService.AddData(supplyTasks);


                            inventoryInfosUp.AddRange(dt_InventoryInfos);


                            batchesUp.Add(inventory_Batch);


                            //_inventory_BatchServices.Repository.UpdateData(inventory_Batch);


                            //_inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);


                            //_supplyTaskService.AddData(supplyTasks);


                        }


                        #endregion


                        else


                        {


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


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


                            Dt_DeliveryOrderDetail orderDetail = null;


                            Dt_DeliveryOrderDetail orderDetailLK = null;


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


@@ -334,7 +487,7 @@


                            #region æ•´ä»¶ä¼˜å…ˆåˆ†é…å¤§ä»¶åº“,计划库存,添加出库任务


                            foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ))


                            {


                                if (xs <= 0) break;


                                if (xs <= 0 || item.AvailableQuantity <= 0) break;


                                decimal outqty = 0;


                                while (item.AvailableQuantity > 0 && xs > 0)


                                {


@@ -382,7 +535,8 @@


                                    Remark = "出库"


                                };


                                supplyTasks.Add(supplyTask);


                                _inventoryInfoService.Repository.UpdateData(item);


                                inventoryInfosUp.Add(item);


                                //_inventoryInfoService.Repository.UpdateData(item);


                            }


                            #endregion




@@ -414,7 +568,9 @@


                            if (orderDetailLK != null)


                            {


                                #region æ·»åŠ å‡ºåº“任务、修改库存信息


                                Dt_InventoryInfo inventoryInfo = dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();


                                Dt_InventoryInfo? inventoryInfo = dt_InventoryInfos.FirstOrDefault(x => x.WarehouseCode == WareCodeLK);


                                if (inventoryInfo == null)


                                    throw new Exception($"出库单【{outorder.order_no}】详情存在散件,物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】所需数量【{Convert.ToInt32(orderDetailLK.Order_qty)}】请人工调拨补货入立库");


                                inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;


                                inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;


                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()


@@ -436,24 +592,40 @@


                                };


                                supplyTasks.Add(supplyTask);


                                #endregion


                                _inventoryInfoService.Repository.UpdateData(inventoryInfo);


                                //_inventoryInfoService.Repository.UpdateData(inventoryInfo);


                                inventoryInfosUp.Add(inventoryInfo);


                                entityOrderLK.Details.Add(orderDetailLK);


                            }


                            #endregion


                            if (orderDetail != null) entityOrder.Details.Add(orderDetail);


                            _inventory_BatchServices.Repository.UpdateData(inventory_Batch);


                            _supplyTaskService.AddData(supplyTasks);


                            batchesUp.Add(inventory_Batch);


                            //_inventory_BatchServices.Repository.UpdateData(inventory_Batch);


                            //_supplyTaskService.AddData(supplyTasks);


                        }


                    }


                    if (entityOrder.Details.Count > 0)


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


                    if (entityOrderLK.Details.Count > 0)


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


                    try


                    {


                        _unitOfWorkManage.BeginTran();


                        _supplyTaskService.AddData(supplyTasks);


                        _inventory_BatchServices.UpdateData(batchesUp);


                        _inventoryInfoService.UpdateData(inventoryInfosUp);


                        if (entityOrder.Details.Count > 0)


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


                        if (entityOrderLK.Details.Count > 0)


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


                        _unitOfWorkManage.CommitTran();


                    }


                    catch (Exception ex)


                    {


                        _unitOfWorkManage.RollbackTran();


                    }


                    #endregion


                }


                webResponseContent.OK();


            }


            catch (Exception ex)


            {


                _messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, (outorder.order_type == "3" ? "入库退货" : "正常出库") + $"：单号【{outorder.order_no}】", ex.Message);


                webResponseContent.Error(ex.Message);


            }


            return webResponseContent;


@@ -468,18 +640,24 @@


            {


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


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


                List<Dt_SupplyTask_Hty> supplyTask_Hties = new List<Dt_SupplyTask_Hty>();


                List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();


                List<Dt_InventoryInfo> infosUp = new List<Dt_InventoryInfo>();


                var codes = order.details.Select(x => x.goods_no).ToList();


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


                if (order.warehouse_no == WareCodeMJ || order.warehouse_no == WareCodeLD)


                {


                    List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));


                    List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));


                    #region åº“存、库存批次平账


                    foreach (var item in order.details)


                    {


                        //找库存批次信息


                        Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);


                        var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);


                        Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();


                        var Qty = Math.Abs(inventory_Batch.SupplyQuantity);


                        if (Qty != item.order_qty) throw new Exception($"盘亏出库单【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的盘亏数量有误");


                        //找所有库存


                        List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);


                        List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();


                        foreach (var inventoryInfo in inventoryInfos)


                        {


                            #region æ·»åŠ ç›˜äºå‡ºåº“任务


@@ -500,21 +678,26 @@


                                    Creater = App.User.UserName,


                                    LocationCode = inventoryInfo.LocationCode,


                                    OrderNo = order.order_no,


                                    StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),


                                    StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),


                                    SupplyQuantity = 0,


                                    Remark = "盘亏入库"


                                };


                                _supplyTaskHtyService.AddData(supplyTask_Hty);


                                //_supplyTaskHtyService.AddData(supplyTask_Hty);


                                supplyTask_Hties.Add(supplyTask_Hty);


                            }


                            #endregion


                            inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                            inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;


                            inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;


                            inventoryInfo.SupplyQuantity = 0;


                            inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();


                        }


                        inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;


                        inventory_Batch.StockQuantity += inventory_Batch.SupplyQuantity;


                        inventory_Batch.AvailableQuantity = inventory_Batch.StockQuantity;


                        inventory_Batch.SupplyQuantity = 0;


                        _inventoryInfoService.UpdateData(inventoryInfos);


                        _inventory_BatchServices.UpdateData(inventory_Batch);


                        infosUp.AddRange(inventoryInfos);


                        batchesUp.Add(inventory_Batch);


                        //_inventoryInfoService.UpdateData(inventoryInfos);


                        //_inventory_BatchServices.UpdateData(inventory_Batch);


                    }


                    #endregion




@@ -540,30 +723,40 @@


                            Status = 2,


                        }).ToList()


                    };


                    Repository.AddData(entityOrder);


                    _unitOfWorkManage.BeginTran();


                    _supplyTaskHtyService.AddData(supplyTask_Hties);


                    _inventoryInfoService.UpdateData(infosUp);


                    _inventory_BatchServices.UpdateData(batchesUp);


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


                    _unitOfWorkManage.CommitTran();


                    #endregion


                }


                #endregion


                else


                {


                    List<Dt_DeliveryOrder> deliveryOrdersAdd = new List<Dt_DeliveryOrder>();


                    string WareCodeLK = WarehouseEnum.立库.ObjToInt().ToString("000");


                    string WareCodeDJ = WarehouseEnum.大件库.ObjToInt().ToString("000");




                    List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));


                    List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));


                    foreach (var item in order.details)


                    {


                        //找库存批次信息


                        Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);


                        var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);


                        if (Qty != item.order_qty) throw new Exception($"盘盈入库单【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的盘盈数量有误");


                        Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();


                        var Qty = Math.Abs(inventory_Batch.SupplyQuantity);


                        if (Qty != item.order_qty) throw new Exception($"盘亏出库单【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的盘亏数量有误");


                        //找所有库存


                        List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);


                        List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();


                        //获取立库盘点差异数.。。。。。。。。。。。。


                        var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();


                        var LkQty = Math.Abs(inventoryLK.StockQuantity - inventoryLK.SupplyQuantity);


                        //var LkQty = Math.Abs(inventoryLK.SupplyQuantity);


                        var LkQty = inventoryLK.SupplyQuantity;


                        //获取大件库盘点差异数


                        var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();


                        var DJQty = Math.Abs(inventoryDJ.Sum(x => x.StockQuantity) - inventoryDJ.Sum(x => x.SupplyQuantity));


                        if (LkQty + DJQty != Qty) throw new Exception($"【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的物料信息与物料批次信息盘盈数量不符");


                        //var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity));


                        var DJQty = inventoryDJ.Sum(x => x.SupplyQuantity);


                        var count = Math.Abs(LkQty + DJQty);


                        if (count != Qty) throw new Exception($"【{order.order_no}】物料编号【{item.goods_no}】物料批次【{item.batch_num}】的物料信息与物料批次信息盘亏数量不符");


                        if (LkQty == 0)//立库无差异


                        {


                            #region åº“存、库存批次平账


@@ -587,21 +780,26 @@


                                        Creater = App.User.UserName,


                                        LocationCode = inventoryInfo.LocationCode,


                                        OrderNo = order.order_no,


                                        StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),


                                        StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),


                                        SupplyQuantity = 0,


                                        Remark = "盘亏入库"


                                    };


                                    _supplyTaskHtyService.AddData(supplyTask_Hty);


                                    //_supplyTaskHtyService.AddData(supplyTask_Hty);


                                    supplyTask_Hties.Add(supplyTask_Hty);


                                }


                                #endregion


                                inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                                inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;


                                inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;


                                inventoryInfo.SupplyQuantity = 0;


                                inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();


                            }


                            _inventoryInfoService.UpdateData(inventoryInfos);


                            inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;


                            //_inventoryInfoService.UpdateData(inventoryInfos);


                            inventory_Batch.StockQuantity += inventory_Batch.SupplyQuantity;


                            inventory_Batch.AvailableQuantity = inventory_Batch.StockQuantity;


                            inventory_Batch.SupplyQuantity = 0;


                            _inventory_BatchServices.UpdateData(inventory_Batch);


                            //_inventory_BatchServices.UpdateData(inventory_Batch);


                            infosUp.AddRange(inventoryInfos);


                            batchesUp.Add(inventory_Batch);


                            #endregion




                            #region åˆ›å»ºå¤§ä»¶åº“盘点单


@@ -626,8 +824,9 @@


                                    Status = 2,


                                }).ToList()


                            };


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


                            //Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();


                            //Repository.AddData(entityOrder);


                            deliveryOrdersAdd.Add(entityOrder);


                            #endregion


                        }


                        else


@@ -654,18 +853,21 @@


                                        Creater = App.User.UserName,


                                        LocationCode = inventoryInfo.LocationCode,


                                        OrderNo = order.order_no,


                                        StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),


                                        StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),


                                        SupplyQuantity = 0,


                                        Remark = "盘亏出库"


                                    };


                                    _supplyTaskHtyService.AddData(supplyTask_Hty);


                                    //_supplyTaskHtyService.AddData(supplyTask_Hty);


                                    supplyTask_Hties.Add(supplyTask_Hty);


                                }


                                #endregion


                                inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                                inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;


                                inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;


                                inventoryInfo.SupplyQuantity = 0;


                                inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();


                            }


                            _inventoryInfoService.UpdateData(inventoryInfos);


                            //_inventoryInfoService.UpdateData(inventoryInfos);


                            infosUp.AddRange(inventoryInfos);


                            #endregion




                            #region åˆ›å»ºå¤§ä»¶åº“盘点单


@@ -693,10 +895,11 @@


                                    }).ToList()


                                };


                                //Repository.AddData(cabinOrder);


                                Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();


                                //Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();


                                deliveryOrdersAdd.Add(cabinOrder);


                            }


                            #endregion




                            //这里


                            #region åˆ›å»ºç«‹åº“盘点单


                            var entityOrder = new Dt_DeliveryOrder


                            {


@@ -710,7 +913,7 @@


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


                                {


                                    Goods_no = d.goods_no,


                                    Order_qty = LkQty,


                                    Order_qty = Math.Abs(LkQty), //给下游WCS的是要整数


                                    Batch_num = d.batch_num,


                                    Exp_date = d.exp_date,


                                    Reservoirarea = WareCodeLK,


@@ -718,16 +921,25 @@


                                    Status = 0,


                                }).ToList()


                            };


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


                            //Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();


                            //Repository.AddData(entityOrder);


                            deliveryOrdersAdd.Add(entityOrder);


                            #endregion


                        }


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


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


                    }


                    _unitOfWorkManage.BeginTran();


                    _supplyTaskHtyService.AddData(supplyTask_Hties);


                    _inventoryInfoService.UpdateData(infosUp);


                    _inventory_BatchServices.UpdateData(batchesUp);


                    BaseDal.Db.InsertNav(deliveryOrdersAdd).Include(it => it.Details).ExecuteCommand();


                    _unitOfWorkManage.CommitTran();


                }


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


            }


            catch (Exception ex)


            {


                _unitOfWorkManage.RollbackTran();


                content.Error(ex.Message);


            }


            return content;


@@ -742,9 +954,7 @@


            try


            {


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


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


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


                    .First();


                var batchInfo = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo);




                if (batchInfo == null)


                    return response.Error($"未找到该物料 [{goodsNo}] æ‰¹æ¬¡ [{batchNo}] çš„库存信息");


@@ -854,6 +1064,12 @@


            return content;


        }






        /// <summary>


        /// pad出库完成


        /// </summary>


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


        /// <returns></returns>


        public WebResponseContent OutFinish(SaveModel saveModel)


        {


            WebResponseContent content = new WebResponseContent();


@@ -864,10 +1080,92 @@


                Dt_SupplyTask supplyTask = _supplyTaskService.Repository.QueryFirst(x => x.TaskId == TaskId && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt());


                if (supplyTask == null) throw new Exception("当前出库任务已完成");


                if (supplyTask.LocationCode != LocationCode) throw new Exception($"当前出库货位【{LocationCode}】与任务分配货位不匹配");


                content = OutTaskFinish(supplyTask);


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


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


                content = OutTaskFinish(supplyTask, deliveryOrder);


            }


            catch (Exception ex)


            {


                content.Error(ex.Message);


            }


            return content;


        }




        public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask, Dt_DeliveryOrder deliveryOrder)


        {


            WebResponseContent content = new WebResponseContent();


            try


            {


                Dt_DeliveryOrderDetail? cabinOrderDetail = deliveryOrder.Details.FirstOrDefault(x => x.Batch_num == supplyTask.BatchNo && x.Goods_no == supplyTask.MaterielCode);


                if (cabinOrderDetail == null) throw new Exception($"出库单明细未找到");


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


                if (materielInfo == null) throw new Exception($"请维护物料编号【{supplyTask.MaterielCode}】的物料信息");


                cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;


                if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty) throw new Exception($"出库数量不可超出单据数量");


                deliveryOrder.OutStatus = "开始";


                cabinOrderDetail.OotDetailStatus = "开始";


                if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty) cabinOrderDetail.OotDetailStatus = "已完成";




                #region åº“å­˜


                Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == supplyTask.LocationCode);


                if (inventoryInfo == null) throw new Exception($"未找到货位【{supplyTask.LocationCode}】的库存信息");


                inventoryInfo.StockQuantity -= supplyTask.StockQuantity;


                inventoryInfo.OutboundQuantity -= supplyTask.StockQuantity;


                #endregion


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


                #region è´§ä½


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


                {


                    if (location == null)


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


                    Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);


                    if (inventoryInfo1 == null) location.LocationStatus = LocationStatusEnum.Free.ObjToInt();


                }


                #endregion




                #region åº“存批次 å¦‚果任务类型是调拨出库任务（8）就不修改批次库存


                Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode ==


                    inventoryInfo.MaterielCode);


                if (supplyTask.TaskType != TaskTypeEnum.AllocatOut.ObjToInt())


                {


                    inventory_Batch.StockQuantity -= supplyTask.StockQuantity;


                    inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;


                }


                #endregion


                supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();




                _unitOfWorkManage.BeginTran();


                if (inventory_Batch.StockQuantity <= 0)


                    _inventory_BatchServices.DeleteData(inventory_Batch);


                else


                    _inventory_BatchServices.UpdateData(inventory_Batch);


                _materielInfoService.UpdateData(materielInfo);


                if (inventoryInfo.StockQuantity <= 0)


                    _inventoryInfoService.DeleteData(inventoryInfo);


                else


                    _inventoryInfoService.UpdateData(inventoryInfo);


                if (location != null) _locationInfoService.UpdateData(location);


                _deliveryOrderDetailServices.UpdateData(cabinOrderDetail);


                _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.人工完成);




                #region åˆ¤æ–­è¯¦æƒ…是否全部完成


                if (!_deliveryOrderDetailServices.Repository.QueryData(x => x.DeliveryOrderId == deliveryOrder.Id && x.OotDetailStatus != "已完成").Any())


                    deliveryOrder.OutStatus = "已完成";


                BaseDal.UpdateData(deliveryOrder);


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


                {


                    materielInfo.Business_qty -= supplyTask.StockQuantity;


                    if (materielInfo.Business_qty < materielInfo.MinQty)


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


                }


                #endregion


                _unitOfWorkManage.CommitTran();




                content.OK();


            }


            catch (Exception ex)


            {


                _unitOfWorkManage.RollbackTran();


                content.Error(ex.Message);


            }


            return content;


@@ -879,11 +1177,11 @@


            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();


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


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




                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);


                if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"出库单明细未找到");


                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)


@@ -891,7 +1189,7 @@






                #region å¤„理出库单，货位，库存，库存批次信息,出库任务


                _unitOfWorkManage.BeginTran();


                //_unitOfWorkManage.BeginTran();




                #region å‡ºåº“单


                cabinOrder.OutStatus = "开始";


@@ -922,7 +1220,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())


@@ -931,7 +1229,7 @@


                    if (inventoryInfo1 == null)


                    {


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


                        _basicService.LocationInfoService.UpdateData(location);


                        _locationInfoService.UpdateData(location);


                    }


                }


                #endregion


@@ -941,26 +1239,29 @@


                supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();


                _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.人工完成);




                #region åº“存批次


                Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);


                if (inventory_Batch != null)


                #region åº“存批次 å¦‚果任务类型是调拨出库任务（8）就不修改批次库存


                if (supplyTask.TaskType != TaskTypeEnum.AllocatOut.ObjToInt())


                {


                    inventory_Batch.StockQuantity -= supplyTask.StockQuantity;


                    inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;


                    if (inventory_Batch.StockQuantity <= 0)


                        _inventory_BatchServices.DeleteData(inventory_Batch);


                    else


                        _inventory_BatchServices.UpdateData(inventory_Batch);


                    Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);


                    if (inventory_Batch != null)


                    {


                        inventory_Batch.StockQuantity -= supplyTask.StockQuantity;


                        inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;


                        if (inventory_Batch.StockQuantity <= 0)


                            _inventory_BatchServices.DeleteData(inventory_Batch);


                        else


                            _inventory_BatchServices.UpdateData(inventory_Batch);


                    }


                }


                #endregion


                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);//创建调拨任务


                }


                _unitOfWorkManage.CommitTran();


                //_unitOfWorkManage.CommitTran();


                #endregion


                content.OK();


            }


@@ -971,6 +1272,11 @@


            return content;


        }




        /// <summary>


        /// äººå·¥åœ¨å‡ºåº“单中点击完成按钮实现上报


        /// </summary>


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


        /// <returns></returns>


        public WebResponseContent FinishOutOrder(int key)


        {


            WebResponseContent content = new WebResponseContent();


@@ -978,31 +1284,38 @@


            {


                Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == key);


                List<Dt_DeliveryOrder> deliveryOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == deliveryOrder.Out_no).Includes(x => x.Details).ToList();//找出所有出库单号相同的出库单


                _unitOfWorkManage.BeginTran();


                List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();


                foreach (var item in deliveryOrders)


                {


                    if (item.Details != null)


                        _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.人工完成);


                    if (item.Details != null) deliveryOrderDetails.AddRange(item.Details);


                    item.Modifier = App.User.UserName;


                    item.ModifyDate = DateTime.Now;


                    item.Details = null;


                }


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


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


                var requestDate = new


                if (deliveryOrder.Out_type == OutOrderTypeEnum.Allocate.ObjToInt().ToString())


                {


                    order_no = deliveryOrder.Out_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();


                    _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(deliveryOrderDetails, OperateTypeEnum.人工完成);


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


                }


                else


                {


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


                    if (deliveryOrder.Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";


                    var requestDate = new


                    {


                        order_no = deliveryOrder.Out_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" && response.resultMsg != "未找到合法单据") throw new Exception(response.resultMsg);


                    _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(deliveryOrderDetails, OperateTypeEnum.人工完成);


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


                }


                content.OK();


            }


            catch (Exception ex)


            {


                _unitOfWorkManage.RollbackTran();


                content.Error(ex.Message);


            }


            return content;