1

huangxiaoqiang

8 天以前 7195016afc472307e4db0b415e45c9d4275bdb02

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

@@ -11,6 +11,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 +32,7 @@
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;
@@ -54,6 +56,7 @@
    private readonly IDt_AreaInfoRepository _areaInfoRepository; //区域
    private readonly IDt_StationManagerRepository _stationManagerRepository;
    private readonly ISys_ConfigService _configService;
    private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;

    public Dt_TaskService(IDt_TaskRepository BaseDal,
                                IUnitOfWorkManage unitOfWorkManage,
@@ -67,7 +70,8 @@
                                IDt_AreaInfoRepository areaInfoRepository,
                                IStockInfoDetailRepository stockInfoDetailRepository,
                                IDt_StationManagerRepository stationManagerRepository,
                                ISys_ConfigService configService) : base(BaseDal)
                                ISys_ConfigService configService,
                                IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
    {
        _unitOfWorkManage = unitOfWorkManage;
        _stockInfoRepository = stockInfoRepository;
@@ -81,6 +85,7 @@
        _stockInfoDetailRepository = stockInfoDetailRepository;
        _stationManagerRepository = stationManagerRepository;
        _configService = configService;
        _orderOutDetailsRepository = orderOutDetailsRepository;
    }

    #region å¤–部接口方法
@@ -104,77 +109,46 @@
            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>();

            DtStockInfo_Hty stockInfo_Hty = null;
            if (task.TaskType != (int)TaskOutboundTypeEnum.Outbound)
            orderDetails.ForEach(item =>
            {
                var stockDetailsToRemove = new List<DtStockInfoDetail>();

                // å¤„理库存明细
                if (stock.StockInfoDetails == null || !stock.StockInfoDetails.Any())
                {
                    // å½“库存明细为空时，将整个库存移入历史表
                    stockInfo_Hty = CreateStockInfoHty(stock, null, true);
                }
                else
                {
                    foreach (var item in stock.StockInfoDetails.ToList())
                    {
                        if (item.OutboundQuantity <= 0 || item.OutboundQuantity > item.Quantity)
                        {
                            throw new Exception($"出库数量异常，物料 {item.MaterielCode} çš„出库数量 {item.OutboundQuantity} ä¸åˆæ³•");
                        }

                        if (item.OutboundQuantity == item.Quantity)
                        {
                            // å®Œå…¨å‡ºåº“，移入历史表
                            if (stockInfo_Hty == null)
                            {
                                stockInfo_Hty = CreateStockInfoHty(stock, new List<DtStockInfoDetail> { item }, false);
                            }
                            else
                            {
                                stockInfo_Hty.StockInfoDetails.Add(CreateStockInfoDetailHty(item));
                            }
                            stockDetailsToRemove.Add(item);
                        }
                        else if (item.OutboundQuantity < item.Quantity && item.OutboundQuantity > 0)
                        {
                            // éƒ¨åˆ†å‡ºåº“，更新数量
                            item.Quantity -= item.OutboundQuantity;
                            item.OutboundQuantity = 0; // é‡ç½®å‡ºåº“数量
                        }
                    }

                    // ç§»é™¤å·²å®Œå…¨å‡ºåº“的明细
                    foreach (var item in stockDetailsToRemove)
                    {
                        stock.StockInfoDetails.Remove(item);
                    }
                }
            }
                orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
            });
            //盘点出库
            
            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
            {
                if (orderDetails.Count > 0)
                    content = await ERPAllocate(orderDetails);
            }
            //其他出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
            {
                if (orderDetails.Count > 0)
                    content = await ERPMixedSend(orderDetails);
            }
            //生产领料出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
            {
                if (orderDetails.Count > 0)
                    content = await ERPProduction(orderDetails);
            }
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                // å¦‚果库存明细全部出库完毕，删除原库存记录
                if (stock.StockInfoDetails == null || !stock.StockInfoDetails.Any())
                {
                    await _stockInfoRepository.DeleteDataAsync(stock);
                }
                else
                {
                    _stockInfoRepository.UpdateData(stock);
                }
                // æ·»åŠ åŽ†å²è®°å½•
                if (stockInfo_Hty != null)
                {
                    await AddStockInfoHtyAsync(stockInfo_Hty);
                }

                await DeleteStockInfoAsync(stock.Id);
                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();

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

                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
@@ -187,55 +161,6 @@
            return content.Error(ex.Message);
        }
        return content;
    }

    private DtStockInfo_Hty CreateStockInfoHty(DtStockInfo stock, List<DtStockInfoDetail> details, bool isFullExit)
    {
        var stockInfoHty = new DtStockInfo_Hty()
        {
            PalletCode = stock.PalletCode,
            LocationCode = stock.LocationCode,
            IsFullExit = isFullExit,
            StockStatus = stock.StockStatus,
            OrderNo = stock.OrderNo,
            OrderType = stock.OrderType,
            Remark = stock.Remark,
            StockInfoDetails = new List<DtStockInfoDetail_Hty>()
        };

        if (details != null)
        {
            foreach (var detail in details)
            {
                stockInfoHty.StockInfoDetails.Add(CreateStockInfoDetailHty(detail));
            }
        }

        return stockInfoHty;
    }

    /// <summary>
    /// åˆ›å»ºåº“存明细历史记录
    /// </summary>
    private DtStockInfoDetail_Hty CreateStockInfoDetailHty(DtStockInfoDetail detail)
    {
        return new DtStockInfoDetail_Hty
        {
            MaterielCode = detail.MaterielCode,
            MaterielName = detail.MaterielName,
            DemandClassification = detail.DemandClassification,
            Warehouse = detail.Warehouse,
            OrderNo = detail.OrderNo,
            Unit = detail.Unit,
            Specs = detail.Specs,
            Weight = detail.Weight,
            Quantity = detail.Quantity,
            OutboundQuantity = detail.OutboundQuantity,
            Status = detail.Status,
            DrawingNumber = detail.DrawingNumber,
            Date = detail.Date,
            Remark = detail.Remark
        };
    }

    #endregion å‡ºåº“任务完成
@@ -255,7 +180,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.自动完成;
@@ -266,7 +191,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);
@@ -313,8 +237,15 @@
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";

            var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.Lock, 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);

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

            await _unitOfWorkManage.UseTranAsync(async () =>
            {
@@ -330,6 +261,8 @@
        }
        catch (Exception ex)
        {
            task.ErrorMessage = ex.Message;
            await BaseDal.UpdateDataAsync(task);
            return content.Error(ex.Message);
        }
        return content;
@@ -505,14 +438,14 @@
                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.DBERP.Queryable<WMS_用友库存一览表_ST>().Where(x => x.仓库名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName).ToList().FirstOrDefault();
                if (ERPStock == null)
                {
                    return content.Error($"组盘数据未在ERP库存数据中，请人工确认数据是否正确");
                }
            }

            var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
            if (StartAddress == null)
@@ -588,8 +521,8 @@
                await _locationRepository.UpdateDataAsync(result2.Item2);
                BaseDal.AddData(taskNew);
            });
            //return content = await SendWCSTask(taskDTO);
            return content.OK("成功");
            return content = await SendWCSTask(taskDTO);
            //return content.OK("成功");
        }
        catch (Exception err)
        {
@@ -665,29 +598,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)
        {
@@ -768,6 +684,24 @@
            }

            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            stcok.StockInfoDetails.ForEach(x =>
            {
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stcok.PalletCode,
                    OrderType = (int)OrderTypeEmun.盘点出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "WMS出库缓存区",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "205",
                    OutboundQuantity = x.Quantity,
                });
            });

            var taskDto = CreateListTaskDTO(taskNew);
            var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
@@ -777,6 +711,7 @@
                _stockInfoRepository.UpdateData(stcok);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                _orderOutDetailsRepository.AddData(outDetails);
            });
            return content = await SendWCSTask(taskDto);
        }
@@ -1118,7 +1053,7 @@
                    MaterialNo = "",
                    NextAddress = TargetAddress.LocationCode,
                    OrderNo = null,
                    PalletCode = taskDto.PalletCode + "001",
                    PalletCode = stock.PalletCode,
                    SourceAddress = locationLateral.LocationCode,
                    CurrentAddress = locationLateral.LocationCode,
                    TaskState = (int)TaskRelocationStatusEnum.RelocationNew,
@@ -1333,14 +1268,12 @@
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> ERPProduction(string palletCode)
    public async Task<WebResponseContent> ERPProduction(List<Dt_OrderOutDetails> orderOutDetails)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
            Dt_Task task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
            MaterialRequisition allocate = new MaterialRequisition
            MaterialRequisition materialRequisition = new MaterialRequisition
            {
                context = new Context
                {
@@ -1352,21 +1285,27 @@
                documentTypeCode = "TransIn002",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                issueList = new List<issueList>()
                issueList = orderOutDetails.Select(item => new issueList
                {
                    new issueList
                    {
                        //备料ID
                        PickListID = task.OrderNo,
                        //存储地点
                        WhCode = "204",
                        //领料数量
                        IssueQty = task.OrderNo,
                    }
                }
                    PickListID = item.MaterielID,
                    //存储地点
                    WhCode = item.WareHouseId,
                    //领料数量
                    IssueQty = item.OutboundQuantity,
                }).ToList()

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

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

            var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
            if (respone.ResultStatus)
            {
                return content.OK();
            }
            return content.Error(respone.ResultMsg);
        }
        catch (Exception ex)
        {
@@ -1378,12 +1317,12 @@
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> ERPAllocate(string palletCode)
    /// 
    public async Task<WebResponseContent> ERPAllocate(DtStockInfo stock)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x=>x.PalletCode== palletCode);
            Allocate allocate = new Allocate
            {
                context = new Context
@@ -1397,19 +1336,80 @@
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

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

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


    public async Task<WebResponseContent> ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            List<transferInList> transferInList=new List<transferInList>();
            orderOutDetails.ForEach(x =>
            {
                transferInList.Add(new transferInList
                {
                    //物料编码
                    ItemCode = x.MaterielCode,
                    //调入仓库地址
                    TransInWHCode = x.AllocateWarehouseId,
                    //调入数量
                    TransInQty = x.OutboundQuantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = x.WareHouseId,
                });
            });
            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<Respone>(result.ToString());
            if (respone.ResultStatus)
            {
                return content.OK();
            }
            return content.Error(respone.ResultMsg);
        }
        catch (Exception ex)
        {
@@ -1421,12 +1421,11 @@
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> ERPMixedSend(string palletCode)
    public async Task<WebResponseContent> ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
            MixedSend send = new MixedSend
            {
                context = new Context
@@ -1440,18 +1439,27 @@
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                miscShipList = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new miscShipList
                miscShipList = orderOutDetails.Select(item => new miscShipList
                {
                    //物料编码
                    ItemCode = item.MaterielCode,
                    //存储地点编号
                    WhCode = item.Warehouse,
                    WhCode = item.WareHouseId,
                    //杂发数量
                    Qty = item.OutboundQuantity,
                    BenefitDeptCode = "0505",
                }).ToList()
            };
            return content.OK(data: send);
            var ERPMixedSend = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MixedSend);
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());

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