1

huangxiaoqiang

7 天以前 4dfe8ece141f05a163cf7d290b6fe4c520d89909

 ÏîÄ¿´úÂë/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;
@@ -122,19 +123,25 @@
            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
            {
                if (orderDetails.Count > 0)
                    content = await ERPAllocate(orderDetails);
                    await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.盘点出库单 || x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
            }
            //其他出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
            {
                if (orderDetails.Count > 0)
                    content = await ERPMixedSend(orderDetails);
                {
                    await ERPMixedSend(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.其他出库单).ToList());
                    await ERPAllocate(orderDetails.Where(x =>  x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
                }
            }
            //生产领料出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
            {
                if (orderDetails.Count > 0)
                    content = await ERPProduction(orderDetails);
                {
                    content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.生产领料单).ToList());
                    await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
                } 
            }
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
@@ -148,8 +155,6 @@
                await _orderOutDetailsRepository.DeleteDataAsync(orderDetails);
                await SqlSugarHelper.DbWMS.Insertable(orderdetailshtys).ExecuteCommandAsync();

                //_orderOutDetailsRepository.DeleteAndMoveIntoHty(orderDetails,OperateTypeEnum.自动删除);

                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
            });
@@ -158,6 +163,8 @@
        }
        catch (Exception ex)
        {
            task.ErrorMessage = ex.Message;
            await BaseDal.UpdateDataAsync(task);
            return content.Error(ex.Message);
        }
        return content;
@@ -240,12 +247,7 @@
            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);

            content = await ERPAllocate(stock);
            //if (!content.Status)
            //{
            //    throw new Exception(content.Message);
            //}
            //stock.Remark = "";
            await ERPAllocate(stock);

            await _unitOfWorkManage.UseTranAsync(async () =>
            {
@@ -656,6 +658,11 @@
    #endregion

    #region è¯·æ±‚出库
    /// <summary>
    /// æ‰‹åŠ¨å‡ºåº“至缓存区域
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
    {
        WebResponseContent content = new WebResponseContent();
@@ -718,6 +725,179 @@
        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 =>
            {
                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,
                });
            });
            details.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
            {
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stock.PalletCode,
                    OrderType = (int)OrderTypeEmun.调拨出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "WMS出库缓存区",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "205",
                    OutboundQuantity = x.Quantity - 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();
        }
    }

    /// <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}数据");
                }
                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,
                });
            });
            details.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
            {
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stock.PalletCode,
                    OrderType = (int)OrderTypeEmun.调拨出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "WMS出库缓存区",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "205",
                    OutboundQuantity = x.Quantity - 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();
        }
    }

@@ -1300,12 +1480,12 @@

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

            var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
            if (respone.ResultStatus)
            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (respone.d.ResultStatus)
            {
                return content.OK();
            }
            return content.Error(respone.ResultMsg);
            return content.Error(respone.d.ResultMsg);
        }
        catch (Exception ex)
        {
@@ -1318,11 +1498,14 @@
    /// <param name="palletCode"></param>
    /// <returns></returns>
    /// 
    public async Task<WebResponseContent> ERPAllocate(DtStockInfo stock)
    public async Task ERPAllocate(DtStockInfo stock)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (stock == null)
            {
                throw new Exception("未找到库存信息");
            }
            Allocate allocate = new Allocate
            {
                context = new Context
@@ -1352,25 +1535,28 @@
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

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


    public async Task<WebResponseContent> ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
    public async Task ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (orderOutDetails.Count <= 0)
            {
                throw new Exception($"未找到调拨出库数据");
            }
            List<transferInList> transferInList=new List<transferInList>();
            orderOutDetails.ForEach(x =>
            {
@@ -1404,16 +1590,15 @@
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

            var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
            if (respone.ResultStatus)
            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                return content.OK();
                throw new Exception($"ERP调拨出库{respone.d.ResultMsg}");
            }
            return content.Error(respone.ResultMsg);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
            throw new Exception(ex.Message);
        }
    }
    /// <summary>
@@ -1421,11 +1606,14 @@
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
    public async Task ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (orderOutDetails.Count <= 0)
            {
                throw new Exception($"未找到调拨出库数据");
            }
            MixedSend send = new MixedSend
            {
                context = new Context
@@ -1454,16 +1642,15 @@
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());

            var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
            if (respone.ResultStatus)
            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                return content.OK();
                throw new Exception($"ERP其他出库{respone.d.ResultMsg}");
            }
            return content.Error(respone.ResultMsg);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
            throw new Exception(ex.Message);
        }
    }
    /// <summary>