1

huangxiaoqiang

2 天以前 5a15fa73d5f6a39917013871a65eb11a8c013391

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -3,6 +3,7 @@
using Mapster;
using Masuit.Tools;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
using NewLife;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.Table.PivotTable;
@@ -11,6 +12,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Metadata;
@@ -31,6 +33,9 @@
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
using WIDESEA_Model.Models.ERP;
using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
using WIDESEA_StorageTaskRepository;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_QuartzJob.Models;
using static System.Collections.Specialized.BitVector32;
@@ -52,8 +57,7 @@
    private readonly IDt_AreaInfoRepository _areaInfoRepository; //区域
    private readonly IDt_StationManagerRepository _stationManagerRepository;
    private readonly ISys_ConfigService _configService;
    private readonly IDt_OutboundOrderRepository _outorderRepository;
    private readonly IDt_OutboundOrderDetailRepository _outorderdetailRepository;
    private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;

    public Dt_TaskService(IDt_TaskRepository BaseDal,
                                IUnitOfWorkManage unitOfWorkManage,
@@ -68,8 +72,7 @@
                                IStockInfoDetailRepository stockInfoDetailRepository,
                                IDt_StationManagerRepository stationManagerRepository,
                                ISys_ConfigService configService,
                                IDt_OutboundOrderRepository outorderRepository,
                                IDt_OutboundOrderDetailRepository outorderdetailRepository) : base(BaseDal)
                                IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
    {
        _unitOfWorkManage = unitOfWorkManage;
        _stockInfoRepository = stockInfoRepository;
@@ -83,8 +86,7 @@
        _stockInfoDetailRepository = stockInfoDetailRepository;
        _stationManagerRepository = stationManagerRepository;
        _configService = configService;
        _outorderRepository = outorderRepository;
        _outorderdetailRepository = outorderdetailRepository;
        _orderOutDetailsRepository = orderOutDetailsRepository;
    }

    #region å¤–部接口方法
@@ -104,38 +106,96 @@
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";

            //DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
            //stockInfo_Hty.ModifyDate = DateTime.Now; 
            stock.ModifyDate = DateTime.Now;
            stock.LocationCode = task.TargetAddress;
            var result1 = UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
            var result2 = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
            
            DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
            var orderDetails = _orderOutDetailsRepository.QueryData(x => x.PalletCode == task.PalletCode);
            List<Dt_OrderOutDetails_Hty> orderdetailshtys = new List<Dt_OrderOutDetails_Hty>();

            orderDetails.ForEach(item =>
            {
                orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
            });

            var allocateOrderdetail = orderDetails.Where(x => true).ToList();

            await ERPAllocateOut(stock);

            //调拨出库
            if (task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
            {
                if (orderDetails.Count > 0)
                    await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
            }
            //其他出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
            {
                if (orderDetails.Count > 0)
                {
                    await ERPMixedSend(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.其他出库单).ToList());
                }
            }
            //生产领料出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
            {
                if (orderDetails.Count > 0)
                {
                    content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.生产领料单).ToList());
                } 
            }
            List<DtBoxingInfo> boxingInfos = new List<DtBoxingInfo>();
            foreach (var item in allocateOrderdetail)
            {
                var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == item.PalletCode);
                if (boxingInfo == null)
                {
                    continue;
                }
                var boxingdetail = boxingInfo.BoxingInfoDetails.Where(x => x.MaterielCode == item.MaterielCode).ToList();
                if (boxingdetail.Count() > 0)
                {
                    foreach (var detail in boxingdetail)
                    {
                        //detail.Quantity = detail.Quantity - item.OutboundQuantity;
                        detail.Warehouse = "WMS出库缓存区";
                        detail.WareHouseId = "205";
                        //if (detail.Quantity <= 0)
                        //{
                        //    boxingInfo.BoxingInfoDetails.Remove(detail);
                        //}
                    }
                }
                boxingInfos.Add(boxingInfo);
            }
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                //await DeleteStockInfoAsync(stock.Id);
                //await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
                //await AddStockInfoHtyAsync(stockInfo_Hty);
                _stockInfoRepository.UpdateData(stock);
                await DeleteStockInfoAsync(stock.Id);
                _boxingInfoRepository.UpdateDataNav(boxingInfos);
                await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
                await AddStockInfoHtyAsync(stockInfo_Hty);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
                await _locationRepository.UpdateDataAsync(result1.Item2);
                await _locationRepository.UpdateDataAsync(result2.Item2);
                await _orderOutDetailsRepository.DeleteDataAsync(orderDetails);
                await SqlSugarHelper.DbWMS.Insertable(orderdetailshtys).ExecuteCommandAsync();

                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
            });
            content.OK("出库完成");

        }
        catch (Exception ex)
        {
            task.ErrorMessage = ex.Message;
            await BaseDal.UpdateDataAsync(task);
            return content.Error(ex.Message);
        }
        return content;
    }

    

    #endregion å‡ºåº“任务完成

@@ -154,7 +214,7 @@
            var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
            var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

            task.TaskState = (int)TaskOutStatusEnum.OutFinish;
            task.TaskState = (int)TaskRelocationStatusEnum.AGV_RelocationFinish;
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
@@ -165,7 +225,6 @@
            var result = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                //UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                _stockInfoRepository.UpdateData(stock);
@@ -195,45 +254,64 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode && x.StockStatus == (int)StockStateEmun.组盘暂存);
            var boxinfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
            var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
            var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

            if (stock == null)
            if (boxinfo == null)
            {
                return content.Error("未找到组盘数据");
            }
            stock.LocationCode = task.TargetAddress;
            stock.StockStatus = (int)StockStateEmun.已入库;

            var stock = CreateStock(boxinfo, task);

            task.TaskState = (int)TaskInStatusEnum.InFinish;
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
            var result1 = UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);

            var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);

            await ERPAllocate(stock);

            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await _stockInfoRepository.UpdateDataAsync(stock);
                await _stockInfoRepository.AddDataNavAsync(stock);
                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
                await _locationRepository.UpdateDataAsync(result1.Item2);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationRepository.UpdateDataAsync(result2.Item2);

                await _locationRepository.UpdateDataAsync(result1.Item2);
            });
            content.OK("入库完成");
        }
        catch (Exception ex)
        {
            task.ErrorMessage = ex.Message;
            await BaseDal.UpdateDataAsync(task);
            return content.Error(ex.Message);
        }
        return content;
    }


    public DtStockInfo CreateStock(DtBoxingInfo boxingInfo,Dt_Task task)
    {
        var boxDetail = boxingInfo.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
        boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.已入库; });
        return new DtStockInfo()
        {
            PalletCode = task.PalletCode,
            LocationCode = task.TargetAddress,
            CreateDate = DateTime.Now,
            Creater = "system",
            IsFullExit = boxingInfo.IsFullExit,
            StockInfoDetails = boxDetail,
            StockStatus = (int)StockStateEmun.已入库
        };
    }
    #endregion å…¥åº“任务完成

    #region AGV搬运任务完成
@@ -382,20 +460,21 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.组盘暂存);
            if (stock == null)
            var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.组盘暂存);

            if (boxingInfo == null)
            {
                return content.Error("托盘信息不存在，请确认托盘已组盘成功");
            }

            //foreach (var item in boxingInfo.BoxingInfoDetails)
            //{
            //    var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_用友库存一览表_ST>().Where(x => x.仓库名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName).ToList().FirstOrDefault();
            //    if (ERPStock == null)
            //    {
            //        return content.Error($"组盘数据未在ERP库存数据中，请人工确认数据是否正确");
            //    }
            //}
            foreach (var item in boxingInfo.BoxingInfoDetails)
            {
                var ERPStock = SqlSugarHelper.DBERPtext.Queryable<用友即时库存_ST>().Where(x => x.存储地点名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName && x.库存数量 >= item.Quantity).ToList().FirstOrDefault();
                if (ERPStock == null)
                {
                    return content.Error($"组盘数据未在ERP库存数据中，请人工确认数据是否正确");
                }
            }

            var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
            if (StartAddress == null)
@@ -460,8 +539,8 @@
            }
            var taskDTO = CreateListTaskDTO(taskNew);
            
            var result1 = UpdateLocationStatus(StartAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(Endlocation, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result1 = UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(Endlocation, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);

            await _unitOfWorkManage.UseTranAsync(async () =>
            {
@@ -472,6 +551,7 @@
                BaseDal.AddData(taskNew);
            });
            return content = await SendWCSTask(taskDTO);
            //return content.OK("成功");
        }
        catch (Exception err)
        {
@@ -519,11 +599,11 @@
        Dt_Task taskNew = new Dt_Task();
        if (StartAddress.Floor != location.Floor)
        {
            taskNew = RequestAcrossFloorTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto.PalletCode);
            taskNew = RequestAcrossFloorTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
        }
        else
        {
            taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto.PalletCode);
            taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
        }
        return taskNew;

@@ -547,29 +627,12 @@
            if (task == null)
                return content.Error("未找到任务");

            if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish || taskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish || taskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
            {
                var taskHty = CreateHistoricalTask(task);
                await _unitOfWorkManage.UseTranAsync(async () =>
                {
                    var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
                    var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
                    if (asb && asbHty)
                        content.OK();
                    else
                        throw new Exception();
                });
            task.TaskState = taskState;
            var asb = await BaseDal.UpdateDataAsync(task);
            if (asb)
                content.OK();
            }
            else
            {
                task.TaskState = taskState;
                var asb = await BaseDal.UpdateDataAsync(task);
                if (asb)
                    content.OK();
                else
                    content.Error();
            }
                content.Error();
        }
        catch (Exception ex)
        {
@@ -622,29 +685,233 @@
    #endregion

    #region è¯·æ±‚出库
    public async Task<WebResponseContent> OtherOutBoundTaskAsync(string palletCode)
    /// <summary>
    /// æ‰‹åŠ¨å‡ºåº“至缓存区域
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == palletCode);
            DtStockInfo stcok = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
            if (stcok == null)
            {
                return content.Error("托盘信息不存在，请确认托盘已入库成功");
            }

            if (stcok.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
            {
                return content.Error("请确认库存货位状态是否为有货");
            }
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
            if (task != null)
            {
                return content.Error("该托盘已存在任务");
            }

            var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == stcok.LocationCode);
            if (location.AreaId == 2)
            {
                return content.Error("该托盘库存已在出库缓存区");
            }

            Dt_Task taskNew= await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
            return content.OK(data: taskNew);
            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });            

            var taskDto = CreateListTaskDTO(taskNew);
            var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                BaseDal.AddData(taskNew);
                _stockInfoRepository.UpdateData(stcok);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
            });
            return content = await SendWCSTask(taskDto);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }


    public async Task<WebResponseContent> OtherOutBoundTaskAsync(List<DtStockInfoDetail> details)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
            if (stock == null)
            {
                return content.Error("未找到库存表头信息");
            }
            if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
            {
                return content.Error("请确认库存货位状态是否为有货");
            }
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
            if (task != null)
            {
                return content.Error("该托盘已存在任务");
            }
            if (stock.LocationInfo.AreaId == 2)
            {
                return content.Error("该托盘库存已在出库缓存区");
            }

            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });

            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
            {
                if (x.Quantity < x.OutboundQuantity)
                {
                    throw new Exception($"{x.MaterielName}{x.MaterielCode}出库数量不可大于库存数量");
                }
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stock.PalletCode,
                    OrderType = (int)OrderTypeEmun.其他出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "",
                    OutboundQuantity = x.OutboundQuantity,
                });
            });
            stock.StockInfoDetails = details;

            var taskDto = CreateListTaskDTO(taskNew);
            var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await BaseDal.AddDataAsync(taskNew);
                await _stockInfoRepository.UpdateDataNavAsync(stock);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                await _orderOutDetailsRepository.AddDataAsync(outDetails);
            });
            return content = await SendWCSTask(taskDto);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }

    /// <summary>
    /// æ‰‹åŠ¨è°ƒæ‹¨
    /// </summary>
    /// <param name="details"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> HandAllocateOutBoundTaskAsync(List<DtStockInfoDetail> details)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
            if (stock == null)
            {
                return content.Error("未找到库存表头信息");
            }
            if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
            {
                return content.Error("请确认库存货位状态是否为有货");
            }
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
            if (task != null)
            {
                return content.Error("该托盘已存在任务");
            }
            if (stock.LocationInfo.AreaId == 2)
            {
                return content.Error("该托盘库存已在出库缓存区");
            }

            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });

            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
            {
                var areaName = _areaInfoRepository.QueryFirst(y => y.AreaName == x.Remark);
                if (areaName == null)
                {
                    throw new Exception($"未找到调拨仓库{x.Remark}数据");
                }
                if (x.Quantity < x.OutboundQuantity)
                {
                    throw new Exception($"{x.MaterielName}{x.MaterielCode}出库数量不可大于库存数量");
                }
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stock.PalletCode,
                    OrderType = (int)OrderTypeEmun.调拨出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = x.Remark,
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = areaName.AreaName,
                    OutboundQuantity = x.OutboundQuantity,
                });
            });
           
            stock.StockInfoDetails = details;

            var taskDto = CreateListTaskDTO(taskNew);
            var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await BaseDal.AddDataAsync(taskNew);
                await _stockInfoRepository.UpdateDataNavAsync(stock);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                await _orderOutDetailsRepository.AddDataAsync(outDetails);
            });
            return content = await SendWCSTask(taskDto);
        }
        catch (Exception ex)
        {
            return content.Error();
        }
    }

    public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) GetlcoationState(Dt_Task task,int StatusChangeTypeEnum)
    {
        List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
        List<DtLocationInfo> locations = new List<DtLocationInfo>();
        var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, StatusChangeTypeEnum);
        var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.Lock, task.TaskNum.Value, StatusChangeTypeEnum);
        locationStatusChangeRecords.AddRange(result1.Item1);
        locationStatusChangeRecords.AddRange(result2.Item1);
        locations.AddRange(result1.Item2);
        locations.AddRange(result2.Item2);

        return (locationStatusChangeRecords,locations);
    }

    public (List<DtLocationStatusChangeRecord>, List<DtLocationInfo>) GetlcoationState(List<Dt_Task> tasks, int StatusChangeTypeEnum)
    {
        List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
        List<DtLocationInfo> locations = new List<DtLocationInfo>();
        foreach (var item in tasks)
        {
            var result1 = UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, StatusChangeTypeEnum);
            var result2 = UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, StatusChangeTypeEnum);
            locationStatusChangeRecords.AddRange(result1.Item1);
            locationStatusChangeRecords.AddRange(result2.Item1);
            locations.AddRange(result1.Item2);
            locations.AddRange(result2.Item2);
        }
        return (locationStatusChangeRecords, locations);
    }


@@ -731,9 +998,9 @@
            Roadway = "SC1",
            TargetAddress = location.LocationCode,
            Dispatchertime = DateTime.Now,
            MaterialNo = "",
            MaterialNo = taskDto.MaterielCode,
            NextAddress = station.stationChildCode,
            OrderNo = null,
            OrderNo = taskDto.OrderNo,
            PalletCode = taskDto.PalletCode,
            SourceAddress = taskDto.Position,
            CurrentAddress = taskDto.Position,
@@ -756,11 +1023,11 @@
        Dt_Task taskNew = new Dt_Task();
        if (StartAddress.Floor != location.Floor)
        {
            taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto.PalletCode);
            taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto);
        }
        else
        {
            taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType, taskDto.PalletCode);
            taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType,  taskDto);
        }
        return taskNew;

@@ -834,7 +1101,7 @@
    #endregion

    #region è¯·æ±‚跨楼层任务
    public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, string palletCode)
    public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType,  RequestTaskDto taskDto)
    {
        WebResponseContent content = new WebResponseContent();

@@ -845,10 +1112,10 @@
            Roadway = "AGV",
            TargetAddress = EndAddress.LocationCode,
            Dispatchertime = DateTime.Now,
            MaterialNo = "",
            MaterialNo = taskDto.MaterielCode,
            NextAddress = next.stationChildCode,
            OrderNo = null,
            PalletCode = palletCode,
            OrderNo = taskDto.OrderNo,
            PalletCode = taskDto.PalletCode,
            SourceAddress = StartAddress.LocationCode,
            CurrentAddress = StartAddress.LocationCode,
            TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
@@ -865,7 +1132,7 @@
    #endregion

    #region è¯·æ±‚AGV搬运任务
    public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, string palletCode)
    public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, RequestTaskDto taskDto)
    {
        WebResponseContent content = new WebResponseContent();

@@ -875,10 +1142,10 @@
            Roadway = "AGV",
            TargetAddress = EndAddress.LocationCode,
            Dispatchertime = DateTime.Now,
            MaterialNo = "",
            MaterialNo = taskDto.MaterielCode,
            NextAddress = EndAddress.LocationCode,
            OrderNo = null,
            PalletCode = palletCode,
            OrderNo = taskDto.OrderNo,
            PalletCode = taskDto.PalletCode,
            SourceAddress = StartAddress.LocationCode,
            CurrentAddress = StartAddress.LocationCode,
            TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
@@ -949,7 +1216,7 @@
                    MaterialNo = "",
                    NextAddress = TargetAddress.LocationCode,
                    OrderNo = null,
                    PalletCode = taskDto.PalletCode + "001",
                    PalletCode = stock.PalletCode,
                    SourceAddress = locationLateral.LocationCode,
                    CurrentAddress = locationLateral.LocationCode,
                    TaskState = (int)TaskRelocationStatusEnum.RelocationNew,
@@ -1119,6 +1386,29 @@
    }
    #endregion

    #region èŽ·å–任务数据
    public async Task<WebResponseContent> GetTaskData()
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var task = BaseDal.QueryData(x => true);
            Dictionary<string,object> obj=new Dictionary<string, object>()
            {
                 {"name","已完成"},
            };
            

            return content.OK(data:obj);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }

    #endregion

    #endregion å¤–部接口方法

    #region è°ƒç”¨WCS接口
@@ -1133,6 +1423,7 @@
        }
        return wcsBasez + address;
    }

    public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
    {
        WebResponseContent content = new WebResponseContent();
@@ -1159,12 +1450,69 @@
        return wcsBasez + address;
    }

    public async Task<WebResponseContent> SendERPTaskCompletion(string palletCode)
    /// <summary>
    /// ç”Ÿäº§é¢†æ–™
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> ERPProduction(List<Dt_OrderOutDetails> orderOutDetails)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x=>x.PalletCode== palletCode);
            MaterialRequisition materialRequisition = new MaterialRequisition
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "LL20",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,
                issueList = orderOutDetails.Select(item => new issueList
                {
                    PickListID = item.ERPOrderId,
                    //存储地点
                    WhCode = "205",
                    //领料数量
                    IssueQty = item.OutboundQuantity,
                }).ToList()

            };
            var ERPProduction = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MaterialRequisition);
            // å‘送请求并等待响应

            var result = await HttpsClient.PostAsync(ERPProduction, materialRequisition.ToJsonString());

            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (respone.d.ResultStatus)
            {
                return content.OK();
            }
            return content.Error(respone.d.ResultMsg);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }
    /// <summary>
    /// è°ƒæ‹¨
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    /// 
    public async Task ERPAllocate(DtStockInfo stock)
    {
        try
        {
            if (stock == null)
            {
                throw new Exception("未找到库存信息");
            }
            Allocate allocate = new Allocate
            {
                context = new Context
@@ -1180,10 +1528,219 @@

                transferInList = stock.StockInfoDetails.Select(item => new transferInList
                {
                    //物料编码
                    ItemCode = item.MaterielCode,
                    TransInWHCode = item.Warehouse,
                    //调入仓库地址
                    TransInWHCode = "107",
                    //调入数量
                    TransInQty = item.Quantity,
                    TransOutWHCode = "001",
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = item.WareHouseId,
                }).ToList()
            };
            var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                throw new Exception(respone.d.ResultMsg);
            }
            
        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }

    public async Task ERPAllocateOut(DtStockInfo stock)
    {
        try
        {
            if (stock == null)
            {
                throw new Exception("未找到库存信息");
            }
            Allocate allocate = new Allocate
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                transferInList = stock.StockInfoDetails.Select(item => new transferInList
                {
                    //物料编码
                    ItemCode = item.MaterielCode,
                    //调入仓库地址
                    TransInWHCode = "205",
                    //调入数量
                    TransInQty = item.Quantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = "107",
                }).ToList()
            };
            var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                throw new Exception(respone.d.ResultMsg);
            }

        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }


    public async Task ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
    {
        try
        {
            if (orderOutDetails.Count <= 0)
            {
                throw new Exception($"未找到调拨出库数据");
            }
            List<transferInList> transferInList=new List<transferInList>();
            orderOutDetails.ForEach(x =>
            {
                transferInList.Add(new transferInList
                {
                    //物料编码
                    ItemCode = x.MaterielCode,
                    //调入仓库地址
                    TransInWHCode = x.AllocateWarehouseId,
                    //调入数量
                    TransInQty = x.OutboundQuantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = "205",
                });
            });
            Allocate allocate = new Allocate
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,
                transferInList = transferInList,
            };
            var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                throw new Exception($"ERP调拨出库{respone.d.ResultMsg}");
            }
        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }
    /// <summary>
    /// æ‚发
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
    {
        try
        {
            if (orderOutDetails.Count <= 0)
            {
                throw new Exception($"未找到调拨出库数据");
            }
            MixedSend send = new MixedSend
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "MiscShip001",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                miscShipList = orderOutDetails.Select(item => new miscShipList
                {
                    //物料编码
                    ItemCode = item.MaterielCode,
                    //存储地点编号
                    WhCode = "205",
                    //杂发数量
                    Qty = item.OutboundQuantity,

                    BenefitDeptCode = "0505",
                }).ToList()
            };
            var ERPMixedSend = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MixedSend);
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());

            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                throw new Exception($"ERP其他出库{respone.d.ResultMsg}");
            }
        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }
    /// <summary>
    /// æ‚收
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> ERPMixedReceive(string palletCode)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
            MixedReceive allocate = new MixedReceive
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                miscRcvList = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new miscRcvList
                {
                    ItemCode = item.MaterielCode,
                    WhCode = item.Warehouse,
                    Qty = item.OutboundQuantity,
                    CostPrice = 0,
                }).ToList()
            };
            return content.OK(data: allocate);
@@ -1193,7 +1750,45 @@
            return content.Error(ex.Message);
        }
    }
    /// <summary>
    /// é€€æ–™
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> ERPreturnMaterialList(string palletCode)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
            ReturnMaterials allocate = new ReturnMaterials
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                returnMaterialList = stock.StockInfoDetails.Select(item => new returnMaterialList
                {
                    PickListID = item.MaterielCode,
                    WhCode = item.Warehouse,
                    RecedeQty = item.OutboundQuantity,
                    RecedeReason = 1,
                }).ToList()
            };
            return content.OK(data: allocate);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }

    #endregion