方舱智能密集库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yanjinhui
2025-10-27 92e1560e29419d855c9e23b31c11ef261d391e45 
 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs


@@ -41,9 +41,11 @@


        private readonly IInventoryInfoService _inventoryInfoService;


        private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;


        private readonly ISupplyTaskService _supplyTaskService;


        private readonly ISupplyTaskHtyService _supplyTaskHtyService;


        private readonly ITacticsService _tacticsService;


        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) : base(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)


        {


            _basicService = basicService;


            _unitOfWorkManage = unitOfWorkManage;


@@ -53,7 +55,10 @@


            _inventoryInfoService = inventoryInfoService;


            _cabinOrderServices = cabinOrderServices;


            _tacticsService = tacticsService;


            _supplyTaskHtyService = supplyTaskHtyService;


            _messageInfoService = messageInfoService;


        }


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


        /// <summary>


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


        /// </summary>


@@ -103,6 +108,7 @@


                        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}】的库存当前状态不可出库");


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


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


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


@@ -125,7 +131,7 @@


                                    MaterielCode = InventoryInfo.MaterielCode,


                                    MaterielSpec = InventoryInfo.MaterielSpec,


                                    TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),


                                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),


                                    TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),


                                    CreateDate = DateTime.Now,


                                    Creater = App.User.UserName ?? "System",


                                    LocationCode = InventoryInfo.LocationCode,


@@ -149,7 +155,7 @@


                                    MaterielCode = InventoryInfo.MaterielCode,


                                    MaterielSpec = InventoryInfo.MaterielSpec,


                                    TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),


                                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),


                                    TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),


                                    CreateDate = DateTime.Now,


                                    Creater = App.User.UserName ?? "System",


                                    LocationCode = InventoryInfo.LocationCode,


@@ -207,6 +213,7 @@


                        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}】的库存当前状态不可出库");


                        #endregion


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


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


@@ -257,7 +264,7 @@


                                        MaterielCode = InventoryInfo.MaterielCode,


                                        MaterielSpec = InventoryInfo.MaterielSpec,


                                        TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),


                                        TaskType = TaskTypeEnum.OutPick.ObjToInt(),


                                        TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),


                                        CreateDate = DateTime.Now,


                                        Creater = App.User.UserName ?? "System",


                                        LocationCode = InventoryInfo.LocationCode,


@@ -281,7 +288,7 @@


                                        MaterielCode = InventoryInfo.MaterielCode,


                                        MaterielSpec = InventoryInfo.MaterielSpec,


                                        TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),


                                        TaskType = TaskTypeEnum.OutPick.ObjToInt(),


                                        TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),


                                        CreateDate = DateTime.Now,


                                        Creater = App.User.UserName ?? "System",


                                        LocationCode = InventoryInfo.LocationCode,


@@ -365,7 +372,7 @@


                                    MaterielCode = item.MaterielCode,


                                    MaterielSpec = item.MaterielSpec,


                                    TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),


                                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),


                                    TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),


                                    CreateDate = DateTime.Now,


                                    Creater = App.User.UserName ?? "System",


                                    LocationCode = item.LocationCode,


@@ -418,7 +425,7 @@


                                    MaterielCode = inventoryInfo.MaterielCode,


                                    MaterielSpec = inventoryInfo.MaterielSpec,


                                    TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),


                                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),


                                    TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),


                                    CreateDate = DateTime.Now,


                                    Creater = App.User.UserName ?? "System",


                                    LocationCode = inventoryInfo.LocationCode,


@@ -451,111 +458,281 @@


            }


            return webResponseContent;


        }


        /// <summary>


        /// ç”Ÿæˆå‡ºåº“单任务


        /// </summary>


        /// <param name="order_no">出库单号</param>


        /// <returns></returns>


        private bool CreateSupplyTask(List<string> order_no)


        #endregion




        #region åˆ›å»ºç›˜äºå‡ºåº“单


        public WebResponseContent CreateCheckOutOrder(UpstramOutOrderInfo order)


        {


            WebResponseContent content = new WebResponseContent();


            try


            {


                // å…ˆèŽ·å–符合条件的主表数据


                var mainOrders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()


                    .Where(x => order_no.Contains(x.Out_no))


                    .ToList();




                // èŽ·å–所有主表ID


                var mainOrderIds = mainOrders.Select(x => x.Id).ToList();




                // ç›´æŽ¥æŸ¥è¯¢å­è¡¨æ•°æ®


                List<Dt_DeliveryOrderDetail> filteredDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()


                    .Where(d => mainOrderIds.Contains(d.DeliveryOrderId) && d.OotDetailStatus == "新建")


                    .ToList();




                // èŽ·å–所有需要查询的物料编码


                var materielCodes = filteredDetails.Select(x => x.Goods_no).Distinct().ToList();




                // æ‰¹é‡æŸ¥è¯¢ç‰©æ–™ä¿¡æ¯


                var materielList = BaseDal.Db.Queryable<Dt_MaterielInfo>()


                    .Where(x => materielCodes.Contains(x.MaterielCode))


                    .ToList();




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




                foreach (var item in filteredDetails)


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


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


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


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


                {


                    // æ ¹æ®å­è¡¨ç‰©æ–™ç¼–码查询物料信息


                    var medication = materielList.FirstOrDefault(x => x.MaterielCode == item.Goods_no);




                    // æŸ¥æ‰¾å¯¹åº”的主表信息


                    var mainOrder = mainOrders.FirstOrDefault(x => x.Id == item.DeliveryOrderId);


                    //随机生成任务编号加时间戳






                    if (mainOrder == null) continue;




                    var location = Db.Queryable<Dt_InventoryInfo>()


                    .Where(x => x.MaterielCode == ""//materielCode


                             && x.BatchNo == ""//batchNo


                             && x.StockQuantity > 0)


                    .OrderBy(x => x.InDate) // æŒ‰å…¥åº“时间排序


                    .First();




                    var supplyTask = new Dt_SupplyTask


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


                    foreach (var item in order.details)


                    {


                        TaskNum = GenerateTaskNumber(),


                        PalletCode = "0",


                        BatchNo = item.Batch_num,


                        MaterielCode = item.Goods_no,


                        MaterielName = medication?.MaterielName, // å¦‚果物料信息不存在，使用子表的物料名称


                        MaterielSpec = medication?.MaterielSpec, // å¦‚果物料信息不存在，使用子表的物料规格


                        TaskType = 0,


                        TaskStatus = item.Status == 0 ? 0 : 1,


                        WarehouseCode = mainOrder.Warehouse_no,


                        LocationCode = item.Status == 0 ? "立库" : "平库",


                        StockQuantity = item.Order_qty, // å‡è®¾å­è¡¨æœ‰Quantity字段


                        SupplyQuantity = 0,


                        OrderNo = mainOrder.Out_no,


                        Dispatchertime = DateTime.Now,


                        Remark = ""


                        //找库存批次信息


                        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}】的盘亏数量有误");


                        //找所有库存


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


                        foreach (var inventoryInfo in inventoryInfos)


                        {


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


                            if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)


                            {


                                Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()


                                {


                                    WarehouseCode = inventoryInfo.WarehouseCode,


                                    OperateType = OperateTypeEnum.自动完成.ToString(),


                                    InsertTime = DateTime.Now,


                                    TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),


                                    BatchNo = inventoryInfo.BatchNo,


                                    MaterielName = inventoryInfo.MaterielName,


                                    MaterielCode = inventoryInfo.MaterielCode,


                                    MaterielSpec = inventoryInfo.MaterielSpec,


                                    TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),


                                    CreateDate = DateTime.Now,


                                    Creater = App.User.UserName,


                                    LocationCode = inventoryInfo.LocationCode,


                                    OrderNo = order.order_no,


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


                                    SupplyQuantity = 0,


                                    Remark = "盘亏入库"


                                };


                                _supplyTaskHtyService.AddData(supplyTask_Hty);


                            }


                            #endregion


                            inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                            inventoryInfo.SupplyQuantity = 0;


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


                        }


                        inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;


                        inventory_Batch.SupplyQuantity = 0;


                        _inventoryInfoService.UpdateData(inventoryInfos);


                        _inventory_BatchServices.UpdateData(inventory_Batch);


                    }


                    #endregion




                    #region åˆ›å»ºç›˜ç‚¹å•


                    var entityOrder = new Dt_DeliveryOrder


                    {


                        Out_no = order.order_no,


                        Out_type = order.order_type,


                        Client_no = order.client_no,


                        Client_name = order.client_name,


                        OutStatus = "已完成",


                        Account_time = order.account_time,


                        Warehouse_no = order.warehouse_no,


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


                        {


                            Goods_no = d.goods_no,


                            Order_qty = Math.Abs(d.order_qty),


                            Order_Outqty = Math.Abs(d.order_qty),


                            Batch_num = d.batch_num,


                            Exp_date = d.exp_date,


                            Reservoirarea = order.warehouse_no,


                            OotDetailStatus = "已完成",


                            Status = 2,


                        }).ToList()


                    };




                    supplyTasks.Add(supplyTask);


                    Repository.AddData(entityOrder);


                    #endregion


                }




                // æ‰¹é‡æ’入供应任务


                if (supplyTasks.Any())


                #endregion


                else


                {


                    return BaseDal.Db.Insertable(supplyTasks).ExecuteCommand() > 0;


                }


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


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




                return false;


                    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}】的盘盈数量有误");


                        //找所有库存


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


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


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


                        var LkQty = Math.Abs(inventoryLK.StockQuantity - 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}】的物料信息与物料批次信息盘盈数量不符");


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


                        {


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


                            foreach (var inventoryInfo in inventoryInfos)


                            {


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


                                if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)


                                {


                                    Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()


                                    {


                                        WarehouseCode = inventoryInfo.WarehouseCode,


                                        OperateType = OperateTypeEnum.自动完成.ToString(),


                                        InsertTime = DateTime.Now,


                                        TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),


                                        BatchNo = inventoryInfo.BatchNo,


                                        MaterielName = inventoryInfo.MaterielName,


                                        MaterielCode = inventoryInfo.MaterielCode,


                                        MaterielSpec = inventoryInfo.MaterielSpec,


                                        TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),


                                        CreateDate = DateTime.Now,


                                        Creater = App.User.UserName,


                                        LocationCode = inventoryInfo.LocationCode,


                                        OrderNo = order.order_no,


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


                                        SupplyQuantity = 0,


                                        Remark = "盘亏入库"


                                    };


                                    _supplyTaskHtyService.AddData(supplyTask_Hty);


                                }


                                #endregion


                                inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                                inventoryInfo.SupplyQuantity = 0;


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


                            }


                            _inventoryInfoService.UpdateData(inventoryInfos);


                            inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;


                            inventory_Batch.SupplyQuantity = 0;


                            _inventory_BatchServices.UpdateData(inventory_Batch);


                            #endregion




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


                            var entityOrder = new Dt_DeliveryOrder


                            {


                                Out_no = order.order_no,


                                Out_type = order.order_type,


                                Client_no = order.client_no,


                                Account_time = order.account_time,


                                OutStatus = "已完成",


                                Client_name = order.client_name,


                                Warehouse_no = WareCodeDJ,


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


                                {


                                    Goods_no = d.goods_no,


                                    Order_qty = Math.Abs(d.order_qty),


                                    Order_Outqty = Math.Abs(d.order_qty),


                                    Batch_num = d.batch_num,


                                    Exp_date = d.exp_date,


                                    Reservoirarea = WareCodeDJ,


                                    OotDetailStatus = "已完成",


                                    Status = 2,


                                }).ToList()


                            };


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


                            //Repository.AddData(entityOrder);


                            #endregion


                        }


                        else


                        {


                            #region å¤§ä»¶åº“库存平账


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


                            foreach (var inventoryInfo in inventoryInfos)


                            {


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


                                if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)


                                {


                                    Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()


                                    {


                                        WarehouseCode = inventoryInfo.WarehouseCode,


                                        OperateType = OperateTypeEnum.自动完成.ToString(),


                                        InsertTime = DateTime.Now,


                                        TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),


                                        BatchNo = inventoryInfo.BatchNo,


                                        MaterielName = inventoryInfo.MaterielName,


                                        MaterielCode = inventoryInfo.MaterielCode,


                                        MaterielSpec = inventoryInfo.MaterielSpec,


                                        TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),


                                        CreateDate = DateTime.Now,


                                        Creater = App.User.UserName,


                                        LocationCode = inventoryInfo.LocationCode,


                                        OrderNo = order.order_no,


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


                                        SupplyQuantity = 0,


                                        Remark = "盘亏出库"


                                    };


                                    _supplyTaskHtyService.AddData(supplyTask_Hty);


                                }


                                #endregion


                                inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;


                                inventoryInfo.SupplyQuantity = 0;


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


                            }


                            _inventoryInfoService.UpdateData(inventoryInfos);


                            #endregion




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


                            if (DJQty != 0)


                            {


                                var cabinOrder = new Dt_DeliveryOrder


                                {


                                    Out_no = order.order_no,


                                    Out_type = order.order_type,


                                    Client_name = order.client_name,


                                    Account_time = order.account_time,


                                    OutStatus = "已完成",


                                    Client_no = order.client_no,


                                    Warehouse_no = WareCodeDJ,


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


                                    {


                                        Goods_no = d.goods_no,


                                        Order_qty = DJQty,


                                        Order_Outqty = DJQty,


                                        Batch_num = d.batch_num,


                                        Exp_date = d.exp_date,


                                        Reservoirarea = WareCodeDJ,


                                        OotDetailStatus = "已完成",


                                        Status = 2,


                                    }).ToList()


                                };


                                //Repository.AddData(cabinOrder);


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


                            }


                            #endregion




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


                            var entityOrder = new Dt_DeliveryOrder


                            {


                                Out_no = order.order_no,


                                Out_type = order.order_type,


                                Client_no = order.client_no,


                                Account_time = order.account_time,


                                OutStatus = "新建",


                                Client_name = order.client_name,


                                Warehouse_no = WareCodeLK,


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


                                {


                                    Goods_no = d.goods_no,


                                    Order_qty = LkQty,


                                    Batch_num = d.batch_num,


                                    Exp_date = d.exp_date,


                                    Reservoirarea = WareCodeLK,


                                    OotDetailStatus = "新建",


                                    Status = 0,


                                }).ToList()


                            };


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


                            //Repository.AddData(entityOrder);


                            #endregion


                        }


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


                    }


                }


            }


            catch (Exception ex)


            {


                // è®°å½•æ—¥å¿—


                Console.WriteLine($"创建供应任务失败：{ex.Message}");


                return false;


                content.Error(ex.Message);


            }


            return content;


        }








        /// <summary>


        /// ç”Ÿæˆéšæœºä»»åŠ¡ç¼–号（随机数 + æ—¶é—´æˆ³ï¼‰


        /// </summary>


        /// <returns>任务编号</returns>


        private int GenerateTaskNumber()


        {


            // ç”Ÿæˆ4位随机数


            Random random = new Random(Guid.NewGuid().GetHashCode());


            int randomNum = random.Next(1000, 9999); // 1000-9999之间的随机数






            // ç»„合成任务编号：TASK + æ—¶é—´æˆ³ + éšæœºæ•°


            return randomNum;


        }


        #endregion






        //盘点 æ‹¿æ•´ä¸ªæ‰¹æ¬¡ä¿¡æ¯è¡¨çš„商品批号和商品编号来进行盘点


@@ -639,11 +816,11 @@


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


                if (string.IsNullOrEmpty(orderNo))


                {


                    dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "新建" || x.OutStatus == "开始") && x.Warehouse_no == warehouseCode && x.Out_type != "3").Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);


                    dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "新建" || x.OutStatus == "开始") && x.Warehouse_no == warehouseCode && x.Out_type != "20").Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);


                }


                else


                {


                    dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "新建" || x.OutStatus == "开始") && x.Out_type != "3" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);


                    dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "新建" || x.OutStatus == "开始") && x.Out_type != "20" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);


                }




                content.OK(data: dt_ReceiveOrders);


@@ -668,9 +845,9 @@


            WebResponseContent content = new WebResponseContent();


            Dt_DeliveryOrder cabinOrder = new Dt_DeliveryOrder();


            if (isPick)


                cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type == "3");


                cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type == "20");


            else


                cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type != "3");


                cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type != "20");


            //List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Reservoirarea == pageNo.ToString()).ToList(); 


            List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Status == 2).ToList();


            content.OK(data: cabinOrderDetails);


@@ -687,7 +864,7 @@


                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}】与任务分配货位不匹配");


                OutTaskFinish(supplyTask);


                content = OutTaskFinish(supplyTask);


            }


            catch (Exception ex)


            {


@@ -701,11 +878,10 @@


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


                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 (materielInfo == null) return WebResponseContent.Instance.Error($"请维护物料编号【{cabinOrderDetail.Goods_no}】的物料信息");


@@ -726,7 +902,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 != "3").Includes(x => x.Details).First();


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


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


                    cabinOrder.OutStatus = "已完成";


                Repository.UpdateData(cabinOrder);


@@ -781,8 +957,8 @@


                {


                    materielInfo.Business_qty -= supplyTask.StockQuantity;


                    _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);


                    if (materielInfo.Business_qty < materielInfo.MinQty)


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


                    //if (materielInfo.Business_qty < materielInfo.MinQty)


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


                }


                _unitOfWorkManage.CommitTran();


                #endregion


@@ -795,112 +971,34 @@


            return content;


        }






        /// <summary>


        /// å¹³åº“人工拣料出库处理（即人工扫码出库时调用）


        /// </summary>


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


        /// <returns></returns>


        public WebResponseContent MatPicking(SaveModel saveModel)


        public WebResponseContent FinishOutOrder(int key)


        {


            WebResponseContent content = new WebResponseContent();


            try


            {


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


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


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


                var Inqty = saveModel.MainData["Inqty"].ObjToInt();


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


                Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == orderNo && x.Warehouse_no == warehouseCode && x.Out_type != "3").Includes(x => x.Details).First();


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


                Dt_DeliveryOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();


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


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


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


                cabinOrderDetail.Order_Outqty += Inqty;


                if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)


                    return WebResponseContent.Instance.Error($"出库数量不可超出单据数量");




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


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




                #region å‡ºåº“单


                cabinOrder.OutStatus = "开始";


                cabinOrderDetail.OotDetailStatus = "开始";


                if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)


                foreach (var item in deliveryOrders)


                {


                    cabinOrderDetail.OotDetailStatus = "已完成";


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


                    if (item.Details != null)


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


                    item.Modifier = App.User.UserName;


                    item.ModifyDate = DateTime.Now;


                    item.Details = null;


                }


                else


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


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


                var requestDate = new


                {


                    _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);


                }


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


                if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "已完成";


                Repository.UpdateData(cabinOrder);


                #endregion




                #region åº“å­˜


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


                if (inventoryInfo == null) return WebResponseContent.Instance.Error($"未找到货位【{LocationCode}】的库存信息");


                inventoryInfo.StockQuantity -= Inqty;


                if (inventoryInfo.StockQuantity <= 0)


                    _inventoryInfoService.DeleteData(inventoryInfo);


                else


                    _inventoryInfoService.UpdateData(inventoryInfo);


                #endregion




                #region è´§ä½


                var location = _basicService.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}】已禁用，请恢复正常再使用");


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


                if (inventoryInfo1 == null)


                {


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


                    _basicService.LocationInfoService.UpdateData(location);


                }


                #endregion




                #region ä»»åŠ¡è®°å½•


                Dt_SupplyTask supplyTask = new Dt_SupplyTask()


                {


                    WarehouseCode = cabinOrderDetail.Reservoirarea,


                    BatchNo = inventoryInfo.BatchNo,


                    MaterielName = inventoryInfo.MaterielName,


                    MaterielCode = inventoryInfo.MaterielCode,


                    MaterielSpec = inventoryInfo.MaterielSpec,


                    TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),


                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),


                    CreateDate = DateTime.Now,


                    Creater = App.User.UserName,


                    LocationCode = location.LocationCode,


                    OrderNo = cabinOrder.Out_no,


                    StockQuantity = Inqty,


                    SupplyQuantity = 0,


                    Remark = "出库"


                    order_no = deliveryOrder.Out_no


                };


                _supplyTaskService.AddData(supplyTask);


                #endregion




                #region åº“存批次


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


                    if (inventory_Batch.StockQuantity <= 0)


                        _inventory_BatchServices.DeleteData(inventory_Batch);


                    else


                        _inventory_BatchServices.UpdateData(inventory_Batch);


                }


                #endregion




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


                #endregion




                content.OK(cabinOrderDetail.Order_Outqty.ToString());


                content.OK();


            }


            catch (Exception ex)


            {