PP平库功能上线，PDA优化，部分问题点优化

helongyang

2026-03-31 8fcd7a67e4391a5f1fbdb590c2a3f913aeb2a0a0

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs

@@ -30,12 +30,19 @@
using WIDESEA_DTO.Stock;
using SqlSugar;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_DTO.Basic;
using System.Globalization;
using System.Collections;

namespace WIDESEA_TaskInfoService
{
    public partial class TaskService
    {
        static object lock_out = new object();

        static object solderMask_out = new object();

        /// <summary>
        /// æµ‹è¯•æž¶å‡ºä»“
@@ -77,7 +84,7 @@
                      (x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
                    if (locationInfo == null)
                    {
                        return responseContent.Error($"测试架货位。。。。。。。。。:{stockInfo.LocationCode}出库条件不满足");
                        return responseContent.Error($"测试架货位:{stockInfo.LocationCode}出库条件不满足");
                    }
                    //生成测试架出库任务 é”å®šåº“å­˜ æ›´æ”¹è´§ä½çŠ¶æ€
                    Dt_Task taskOut = new()
@@ -95,6 +102,15 @@
                        PalletType = stockInfo.PalletType,
                        WarehouseId = stockInfo.WarehouseId,
                    };
                    string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                    float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                    string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
                    if (MaterielCode != null && Quantity != null && BatchNo != null)
                    {
                        taskOut.MaterielCode = MaterielCode;
                        taskOut.Quantity = Quantity;
                        taskOut.BatchNo = BatchNo;
                    }
                    stockInfo.StockStatus = (int)StockStatusEmun.出库锁定;
                    LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
                    locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -111,6 +127,174 @@
                    _unitOfWorkManage.CommitTran();
                    //将任务推送到WCS
                    PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_CSJ");
                    responseContent.OK();
                }
                catch (Exception ex)
                {
                    _unitOfWorkManage.RollbackTran();
                    responseContent.Error(ex.Message);
                }
                return responseContent;
            }
        }
        public MesResponseContent SolderMaskOutNotice(SolderMaskOutNotice model)
        {
            lock (solderMask_out)
            {
                MesResponseContent responseContent = new MesResponseContent();
                try
                {

                    Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA154.ToString());
                    //获取库存记录
                    List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
                      x.WarehouseId == warehouse.WarehouseId &&
                      x.StockStatus == (int)StockStatusEmun.入库完成).Includes(x => x.Details).ToList();
                    Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.BatchNo == model.LotNo));
                    if (stockInfo == null)
                    {
                        return responseContent.Error($"防焊库:无{model.LotNo}可用库存");
                    }
                    Dt_Task exsit2 = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
                    if (exsit2 != null)
                    {
                        return responseContent.Error($"防焊任务{stockInfo.PalletCode}已存在");
                    }

                    Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode &&
                      x.WarehouseId == stockInfo.WarehouseId &&
                      x.LocationStatus == (int)LocationStatusEnum.InStock &&
                      (x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
                    if (locationInfo == null)
                    {
                        return responseContent.Error($"防焊货位:{stockInfo.LocationCode}出库条件不满足");
                    }
                    //生成防焊出库任务 é”å®šåº“å­˜ æ›´æ”¹è´§ä½çŠ¶æ€
                    Dt_Task taskOut = new()
                    {
                        CurrentAddress = stockInfo.LocationCode,
                        Grade = 0,
                        PalletCode = stockInfo.PalletCode,
                        NextAddress = "",
                        Roadway = locationInfo.RoadwayNo,
                        SourceAddress = stockInfo.LocationCode,
                        TargetAddress = model.TargetAddressCode,
                        TaskStatus = (int)TaskStatusEnum.New,
                        TaskType = stockInfo.PalletType<2 ? (int)TaskTypeEnum.MaskOutNoticeSmall : (int)TaskTypeEnum.MaskOutNoticeLarge,
                        TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                        PalletType = stockInfo.PalletType,
                        WarehouseId = stockInfo.WarehouseId,
                    };
                    string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                    float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                    string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
                    if (MaterielCode != null && Quantity != null && BatchNo != null)
                    {
                        taskOut.MaterielCode = MaterielCode;
                        taskOut.Quantity = Quantity;
                        taskOut.BatchNo = BatchNo;
                    }
                    stockInfo.StockStatus = (int)StockStatusEmun.出库锁定;
                    LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
                    locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
                    //判断是否有出库单信息
                    _unitOfWorkManage.BeginTran();
                    //更新库存状态
                    _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                    //更新货位状态
                    _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
                    //新建任务
                    BaseDal.AddData(taskOut);
                    //加入货位变动记录
                    _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
                    _unitOfWorkManage.CommitTran();
                    //将任务推送到WCS
                    PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_ZH");
                    responseContent.OK();
                }
                catch (Exception ex)
                {
                    _unitOfWorkManage.RollbackTran();
                    responseContent.Error(ex.Message);
                }
                return responseContent;
            }
        }

        public MesResponseContent SolderMaskOut(SolderMaskOut model)
        {
            lock (solderMask_out)
            {
                MesResponseContent responseContent = new MesResponseContent();
                try
                {
                    

                    Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA154.ToString());
                    //获取库存记录
                    List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
                      x.WarehouseId == warehouse.WarehouseId &&
                      x.StockStatus == (int)StockStatusEmun.入库完成).Includes(x => x.Details).ToList();
                    Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.BatchNo == model.LotNo));
                    if (stockInfo == null)
                    {
                        return responseContent.Error($"防焊库:无{model.LotNo}可用库存");
                    }
                    Dt_Task exsit2 = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
                    if (exsit2 != null)
                    {
                        return responseContent.Error($"防焊任务{stockInfo.PalletCode}已存在");
                    }

                    Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode &&
                      x.WarehouseId == stockInfo.WarehouseId &&
                      x.LocationStatus == (int)LocationStatusEnum.InStock &&
                      (x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
                    if (locationInfo == null)
                    {
                        return responseContent.Error($"防焊货位:{stockInfo.LocationCode}出库条件不满足");
                    }
                    //生成防焊出库任务 é”å®šåº“å­˜ æ›´æ”¹è´§ä½çŠ¶æ€
                    Dt_Task taskOut = new()
                    {
                        CurrentAddress = stockInfo.LocationCode,
                        Grade = 0,
                        PalletCode = stockInfo.PalletCode,
                        NextAddress = "",
                        Roadway = locationInfo.RoadwayNo,
                        SourceAddress = stockInfo.LocationCode,
                        TargetAddress = model.TargetAddressCode,
                        TaskStatus = (int)TaskStatusEnum.New,
                        TaskType = stockInfo.PalletType < 2 ? (int)TaskTypeEnum.MaskOutSmall : (int)TaskTypeEnum.MaskOutLarge,
                        TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                        PalletType = stockInfo.PalletType,
                        WarehouseId = stockInfo.WarehouseId,
                    };
                    string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                    float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                    string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
                    if (MaterielCode != null && Quantity != null && BatchNo != null)
                    {
                        taskOut.MaterielCode = MaterielCode;
                        taskOut.Quantity = Quantity;
                        taskOut.BatchNo = BatchNo;
                    }
                    stockInfo.StockStatus = (int)StockStatusEmun.出库锁定;
                    LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
                    locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
                    //判断是否有出库单信息
                    _unitOfWorkManage.BeginTran();
                    //更新库存状态
                    _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                    //更新货位状态
                    _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
                    //新建任务
                    BaseDal.AddData(taskOut);
                    //加入货位变动记录
                    _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
                    _unitOfWorkManage.CommitTran();
                    //将任务推送到WCS
                    PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_ZH");
                    responseContent.OK();
                }
                catch (Exception ex)
@@ -157,6 +341,15 @@
                    PalletType = stockInfo.PalletType,
                    WarehouseId = stockInfo.WarehouseId,
                };
                string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
                if (MaterielCode != null && Quantity != null && BatchNo != null)
                {
                    taskIn.MaterielCode = MaterielCode;
                    taskIn.Quantity = Quantity;
                    taskIn.BatchNo = BatchNo;
                }
                //更改库存状态
                stockInfo.StockStatus = StockStatusEmun.退库.ObjToInt();
                BaseDal.AddData(taskIn);
@@ -329,6 +522,29 @@
            return model;
        }

        public MesMaterialLotaAceptModel PPGetMesMaterialLotaAceptModel(Dt_StockInfo stockInfo, Dt_StockInfoDetail stockInfoDetail, string taskNo, string warehouseCode, float quantity, string cutedType = "", float ppWidth = 0)
        {
            MesMaterialLotaAceptModel model = new MesMaterialLotaAceptModel()
            {
                CarrierCode = stockInfo.PalletCode,
                CutedType = cutedType,
                ExpirationDate = stockInfoDetail.EffectiveDate,
                MaterialBarCode = stockInfoDetail.SerialNumber,
                MaterialCode = stockInfoDetail.MaterielCode,
                MaterialLot = stockInfoDetail.MaterielCode + "," + stockInfoDetail.BatchNo,
                MaterialName = stockInfoDetail.MaterielName,
                PPWidth = ppWidth,
                ProductionDate = stockInfoDetail.ProductionDate,
                Quantity = quantity,
                Supplier = "",
                TaskNo = taskNo,
                Type = 2,
                WarehouseArea = warehouseCode,
                WarehouseLocation = warehouseCode
            };

            return model;
        }
        /// <summary>
        /// åŸºæ¿å‡ºåº“
        /// </summary>
@@ -336,6 +552,7 @@
        /// <returns></returns>
        public MesResponseContent SubstrateOut(SubstrateOutModel model)
        {
            MesResponseContent content = new MesResponseContent();
            try
            {
                string line = string.Empty;
@@ -350,15 +567,15 @@
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == line);
                if (warehouse == null)
                {
                    return MesResponseContent.Instance.Error($"仓库基础信息未配置");
                    return content.Error($"仓库基础信息未配置");
                }

                Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == model.MaterialCode);
                if (materielInfo == null)
                {
                    return MesResponseContent.Instance.Error($"未找到该物料信息");
                    return content.Error($"未找到该物料信息");
                }

                //生成MES板料出库单据
                Dt_MesOutboundOrder mesOutboundOrder = new Dt_MesOutboundOrder()
                {
                    CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
@@ -374,14 +591,15 @@
                };

                List<Dt_Task> tasks = new List<Dt_Task>();

                List<Dt_StockInfo>? stockInfos = null;
                List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                List<Dt_LocationInfo>? locationInfos = null;
                {
                    //分配库存
                    (List<Dt_StockInfo>, Dt_MesOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesOutboundOrderService.AssignStockOutbound(mesOutboundOrder);
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        //创建任务
                        tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
                        result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                        result.Item3.ForEach(x =>
@@ -415,23 +633,26 @@
                _outboundService.MesOutboundOrderService.Repository.AddData(mesOutboundOrder);
                if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
                {
                    WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);
                    WebResponseContent contentResponse = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

                    if (!content.Status)
                    if (!contentResponse.Status)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return MesResponseContent.Instance.Error(content.Message);
                        return content.Error(contentResponse.Message);
                    }
                }
                _unitOfWorkManage.CommitTran();
                PushTasksToWCS(tasks);


                return MesResponseContent.Instance.OK();
                //将开料分配的库存托盘返回给MES
                content.Content = new
                {
                    VehicleCode = stockInfos?.Select(x => x.PalletCode).ToList()
                };
                return content.OK();
            }
            catch (Exception ex)
            {
                return MesResponseContent.Instance.Error(ex.Message);
                return content.Error(ex.Message);
            }
        }

@@ -451,10 +672,16 @@
                }

                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == palletTypeInfo.WarehouseId);

                //判断是否托盘库存是否已存在
                Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == model.CarrierCode);
                if (stockInfoOld != null)
                {
                    return MesResponseContent.Instance.Error($"托盘号库存{model.CarrierCode}已存在");
                }

                Dt_StockInfo_Hty stockInfo_Hty = _stockRepository.StockInfo_HtyRepository.QueryData(x => x.PalletCode == model.CarrierCode).OrderByDescending(x => x.SourceId).First();
                Dt_StockInfoDetail_Hty stockInfoDetail_Hty = _stockRepository.StockInfoDetail_HtyRepository.QueryFirst(x => x.StockId == stockInfo_Hty.SourceId);
                

                Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
                {
@@ -519,7 +746,6 @@
            MesResponseContent modelCount = new MesResponseContent();
            try
            {

                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
                if (warehouse == null)
                {
@@ -542,7 +768,7 @@
                    };
                    mesPPOutboundOrderDetail.Add(dt_MesPPOutboundOrderDetail);
                }
                Dt_MesPPOutboundOrder mesOutboundOrder = new Dt_MesPPOutboundOrder()
                Dt_MesPPOutboundOrder mesPPOutboundOrder1 = new Dt_MesPPOutboundOrder()
                {
                    CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
                    MaterialCode = model.MaterialCode,
@@ -558,67 +784,111 @@
                    Details = mesPPOutboundOrderDetail
                };
                #region
                //Db.InsertNav(mesOutboundOrder).Include(x=>x.Details).ExecuteCommand();
                //    List<Dt_Task> tasks = new List<Dt_Task>();
                List<Dt_Task> tasks = new List<Dt_Task>();

                //    List<Dt_StockInfo>? stockInfos = null;
                //    List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                //    List<Dt_LocationInfo>? locationInfos = null;
                //    {
                //(List<Dt_StockInfo>, Dt_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignStockOutbound(mesOutboundOrder);
                //        if (result.Item1 != null && result.Item1.Count > 0)
                //        {
                //            tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
                //            result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                //            result.Item3.ForEach(x =>
                //            {
                //                x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                //            });
                List<Dt_StockInfo>? stockInfos = null;
                List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                List<Dt_LocationInfo>? locationInfos = null;
                List<Dt_MaterielCodeInfo> materielCodes = new List<Dt_MaterielCodeInfo>();
                {
                    (List<Dt_StockInfo>, Dt_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignPPStockOutbound(mesPPOutboundOrder1);
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        tasks = GetTasks(result.Item1, TaskTypeEnum.MesPPOutbound);
                        result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                        result.Item3.ForEach(x =>
                        {
                            x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                        });

                //            stockInfos = result.Item1;
                //            mesOutboundOrder = result.Item2;
                //            outStockLockInfos = result.Item3;
                //            locationInfos = result.Item4;
                //            mesPPOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                        stockInfos = result.Item1;
                        mesPPOutboundOrder1 = result.Item2;
                        outStockLockInfos = result.Item3;
                        locationInfos = result.Item4;
                        foreach (var item in mesPPOutboundOrderDetail)
                        {
                            item.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                        }

                //        }
                //        else
                //        {
                //            throw new Exception("无库存");
                //        }
                //    }
                //    tasks.ForEach(x =>
                //    {
                //        x.TargetAddress = model.TargetAddressCode;
                //    });
                //    _unitOfWorkManage.BeginTran();

                //    int id = BaseDal.AddData(tasks);
                //    outStockLockInfos.ForEach(x =>
                //    {
                //        x.OrderNo = mesOutboundOrder.TaskNo;
                //        x.OrderDetailId = id;
                //    });
                //    //_outboundService.MesPPOutboundOrderService.Repository.AddData(mesOutboundOrder);
                //    Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
                //    if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
                //    {
                //        WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

                //        if (!content.Status)
                //        {
                //            _unitOfWorkManage.RollbackTran();
                //            return MesResponseContent.Instance.Error(content.Message);
                //        }
                //    }
                //    _unitOfWorkManage.CommitTran();
                //    PushTasksToWCS(tasks);

                //}
                #endregion
                    }
                    else
                    {
                        throw new Exception("无库存");
                    }
                }
                tasks.ForEach(x =>
                {
                    if (x.Roadway.Contains("AGV_PP"))
                    {
                        x.TargetAddress = model.TargetAddressCode;
                    }
                    
                });
                _unitOfWorkManage.BeginTran();
                Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();

                int id = BaseDal.AddData(tasks);
                outStockLockInfos.ForEach(x =>
                {
                    x.OrderNo = mesPPOutboundOrder1.TaskNo;
                    x.OrderDetailId = id;
                });
                Db.InsertNav(mesPPOutboundOrder1).Include(x => x.Details).ExecuteCommand();
                if (stockInfos.Count > 0 && stockInfos != null)
                {
                    var lkstockInfo = stockInfos.Where(x => x.LocationCode.Contains("SC01_PP")).ToList();
                    if(lkstockInfo != null)
                    {
                        foreach (var item in lkstockInfo)
                        {
                            Dt_MaterielInfo materielInfo = BaseDal.Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == item.Details.FirstOrDefault().MaterielCode).First();
                            if(materielInfo == null)
                            {
                                return MesResponseContent.Instance.Error($"未找到物料编号{item.Details.FirstOrDefault().MaterielCode}的物料信息");
                            }
                            Dt_MaterielCodeInfo materielCodeInfo = new Dt_MaterielCodeInfo()
                            {
                                MaterielCode = item.Details.FirstOrDefault().MaterielCode,
                                MaterielName = materielInfo.MaterielName,
                                MaterielSpec = materielInfo.MaterielSpec,
                                LotNo = item.Details.FirstOrDefault().BatchNo,
                                ProductionDate = item.Details.FirstOrDefault().ProductionDate.ObjToDate(),
                                EffectiveDate = item.Details.FirstOrDefault().EffectiveDate.ObjToDate(),
                                PurchaseOrderNo = DateTime.Now.ToString("yyMMdd") + item.Details.FirstOrDefault().BatchNo,
                                Quantity = item.Details.FirstOrDefault().StockQuantity,
                                MaterielLength = (decimal)materielInfo.MaterielLength,
                                WarehouseId = warehouse.WarehouseId
                            };
                            materielCodes.Add(materielCodeInfo);
                        }
                        Db.Insertable(materielCodes).ExecuteCommand();
                    }
                }
                if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
                {
                    WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

                    if (!content.Status)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return MesResponseContent.Instance.Error(content.Message);
                    }
                }
                _unitOfWorkManage.CommitTran();
                var pktask = tasks.Where(x => x.Roadway.Contains("AGV_PP")).ToList();
                if(pktask != null&& pktask.Count>0)
                {
                    PushTasksToWCS(pktask, "AGV_PP");
                }
                var lktask = tasks.Where(x => x.Roadway.Contains("SC01_PP")).ToList();
                if (lktask != null&& lktask.Count>0)
                {
                    PushTasksToWCS(lktask);
                }
                
                #endregion
            //_unitOfWorkManage.BeginTran();
            //Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
            //_unitOfWorkManage.CommitTran();
                return MesResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -639,7 +909,7 @@
            try
            {

                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA581.ToString());
                if (warehouse == null)
                {
                    return MesResponseContent.Instance.Error("仓库基础信息未配置");
@@ -659,67 +929,65 @@
                    CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
                    TaskNo = model.TaskNo,
                    OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
                    OrderStatus = OutOrderStatusEnum.未开始.ObjToInt(),
                    OrderStatus = OutOrderStatusEnum.出库中.ObjToInt(),
                    WarehouseId = warehouse.WarehouseId,
                    Details = mesPPCutOutboundOrderDetail,
                };
                _unitOfWorkManage.BeginTran();
                Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();
                _unitOfWorkManage.CommitTran();

                #region
                //List<Dt_Task> tasks = new List<Dt_Task>();
                List<Dt_Task> tasks = new List<Dt_Task>();

                //List<Dt_StockInfo>? stockInfos = null;
                //List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                //List<Dt_LocationInfo>? locationInfos = null;
                //{
                //(List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignStockOutbound(mesPPOutboundOrder, mesPPCutOutboundOrderDetail);
                //    if (result.Item1 != null && result.Item1.Count > 0)
                //    {
                //        tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
                //        result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                //        result.Item3.ForEach(x =>
                //        {
                //            x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                //        });
                List<Dt_StockInfo>? stockInfos = null;
                List<Dt_OutStockLockInfo>? outStockLockInfos = null;
                List<Dt_LocationInfo>? locationInfos = null;
                {
                    (List<Dt_StockInfo>, List<Dt_MesPPCutOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignPPCutStockOutbound(mesPPOutboundOrder, mesPPCutOutboundOrderDetail);
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        tasks = GetTasks(result.Item1, TaskTypeEnum.MesPPCutOutbound);
                        result.Item2.ForEach(x =>
                        {
                            x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                        });
                        result.Item3.ForEach(x =>
                        {
                            x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                        });

                //        stockInfos = result.Item1;
                //        mesPPCutOutboundOrderDetail = result.Item2;
                //        outStockLockInfos = result.Item3;
                //        locationInfos = result.Item4;
                        stockInfos = result.Item1;
                        mesPPCutOutboundOrderDetail = result.Item2;
                        outStockLockInfos = result.Item3;
                        locationInfos = result.Item4;

                //    }
                //    else
                //    {
                //        throw new Exception("无库存");
                //    }
                //}
                //tasks.ForEach(x =>
                //{
                //    x.TargetAddress = mesPPCutOutboundOrderDetail.TargetAddressCode;
                //});
                //_unitOfWorkManage.BeginTran();
                    }
                    else
                    {
                        throw new Exception("无库存");
                    }
                }
                

                //int id = BaseDal.AddData(tasks);
                //outStockLockInfos.ForEach(x =>
                //{
                //    x.OrderNo = mesPPOutboundOrder.TaskNo;
                //    x.OrderDetailId = id;
                //});
                ////_outboundService.MesPPOutboundOrderService.Repository.AddData(mesOutboundOrder);
                int id = BaseDal.AddData(tasks);
                outStockLockInfos.ForEach(x =>
                {
                    x.OrderNo = mesPPOutboundOrder.TaskNo;
                });
                
                if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
                {
                    WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

                    if (!content.Status)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return MesResponseContent.Instance.Error(content.Message);
                    }
                }
                //Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();
                //if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
                //{
                //    WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);

                //    if (!content.Status)
                //    {
                //        _unitOfWorkManage.RollbackTran();
                //        return MesResponseContent.Instance.Error(content.Message);
                //    }
                //}
                //_unitOfWorkManage.CommitTran();
                //PushTasksToWCS(tasks, "AGV_PP");
                _unitOfWorkManage.CommitTran();
                PushTasksToWCS(tasks, "AGV_PP");
                #endregion
                return MesResponseContent.Instance.OK();
            }
@@ -866,8 +1134,17 @@
                    TaskType = TaskTypeEnum.Inbound.ObjToInt(),
                    TaskStatus = TaskStatusEnum.New.ObjToInt(),
                    WarehouseId = stockInfo.WarehouseId,
                    PalletType = stockInfo.PalletType
                    PalletType = stockInfo.PalletType,
                };
                string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
                if (MaterielCode != null && Quantity != null && BatchNo != null)
                {
                    newTask.MaterielCode = MaterielCode;
                    newTask.Quantity = Quantity;
                    newTask.BatchNo = BatchNo;
                }
                LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
                _unitOfWorkManage.BeginTran();
                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.Lock, LocationChangeType.InboundAssignLocation);
@@ -896,36 +1173,88 @@
            MesResponseContent content = new MesResponseContent();
            try
            {
                //需判断查询立库,平库
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
                List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
                x.WarehouseId == warehouse.WarehouseId &&
                x.StockStatus == (int)StockStatusEmun.入库完成).Includes(x => x.Details).ToList();
                Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.MaterielCode == model.MaterialCode && x.CutedWidth == model.CutedWidth));
                if (stockInfo == null)
                Dt_Warehouse lkwarehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
                Dt_Warehouse pkwarehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA581.ToString());

                if (lkwarehouse == null || pkwarehouse == null)
                {
                    return content.Error($"PP仓立库/平库：物料编号:{model.MaterialCode},裁切宽:{model.CutedWidth},未找到此物料库存信息");
                    return content.Error("立库或平库仓库信息不存在");
                }
                var stock = stockInfo.Details.FirstOrDefault();
                if (stock != null)

                List<Dt_StockInfo> lkstockInfos = _stockRepository.StockInfoRepository.Db
                    .Queryable<Dt_StockInfo>()
                    .Where(x => x.WarehouseId == lkwarehouse.WarehouseId
                             && x.StockStatus == (int)StockStatusEmun.入库完成)
                    .Includes(x => x.Details)
                    .ToList();

                List<Dt_StockInfo> lkTargetStockInfos = lkstockInfos
                    .Where(x => x.Details != null && x.Details.Any(d => d.MaterielCode == model.MaterialCode))
                    .ToList();

                List<Dt_StockInfo> pkstockInfos = _stockRepository.StockInfoRepository.Db
                    .Queryable<Dt_StockInfo>()
                    .Where(x => x.WarehouseId == pkwarehouse.WarehouseId  
                             && x.StockStatus == (int)StockStatusEmun.入库完成)
                    .Includes(x => x.Details)
                    .ToList();

                List<Dt_StockInfo> pkTargetStockInfos = pkstockInfos
                    .Where(x => x.Details != null && x.Details.Any(d => d.MaterielCode == model.MaterialCode))
                    .ToList();


                decimal lkTotalQuantity = (decimal)lkTargetStockInfos
                    .SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>()) 
                    .Where(d => d.MaterielCode == model.MaterialCode)
                    .Sum(d => d.StockQuantity); 

                // å¹³åº“总数
                decimal pkTotalQuantity = (decimal)pkTargetStockInfos
                    .SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
                    .Where(d => d.MaterielCode == model.MaterialCode)
                    .Sum(d => d.StockQuantity);

                if (lkTotalQuantity <= 0 && pkTotalQuantity <= 0)
                {
                    content.Content = new
                    {
                        MaterialCode = stock.MaterielCode,
                        Quantity = stock.StockQuantity,
                        Unit = stock.Unit,
                        Warehouse = warehouse.WarehouseCode,
                        WarehouseName = warehouse.WarehouseName,
                        CutedWidth = stock.CutedWidth,
                        CarrierCode = stockInfo.PalletCode,
                        MaterialLot = stock.BatchNo,
                    };
                    return content.Error($"PP仓立库/平库：物料编号:{model.MaterialCode},未找到此物料库存信息");
                }

                content.Content = new List<object>
                 {
                     new
                     {
                         MaterialCode = model.MaterialCode,
                         Quantity = lkTotalQuantity,
                         Unit = lkTargetStockInfos.SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
                                                  .Where(d => d.MaterielCode == model.MaterialCode)
                                                  .FirstOrDefault()?.Unit ?? "ç®±",
                         Warehouse = lkwarehouse.WarehouseCode,
                         WarehouseName = lkwarehouse.WarehouseName,
                         CutedWidth = 0,
                         CarrierCode = "",
                         MaterialLot = "",
                     },
                     new
                     {
                         MaterialCode = model.MaterialCode,
                         Quantity = pkTotalQuantity,
                         Unit = pkTargetStockInfos.SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
                                                  .Where(d => d.MaterielCode == model.MaterialCode)
                                                  .FirstOrDefault()?.Unit ?? "ç®±",
                         Warehouse = pkwarehouse.WarehouseCode,
                         WarehouseName = pkwarehouse.WarehouseName,
                         CutedWidth = 0,
                         CarrierCode = "",
                         MaterialLot = "",
                     }
                 };

                return content.OK();
            }
            catch (Exception ex)
            {
                return MesResponseContent.Instance.Error(ex.Message);
                return MesResponseContent.Instance.Error($"查询库存失败：{ex.Message}");
            }
        }
        
@@ -1422,6 +1751,158 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
       
        /// <summary>
        /// èŽ·å–MES阻焊批次信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public WebResponseContent GetZHMesMaterialLot(string materialLot)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_GetProductByLot.ToString());
                object obj = new { LotNo = materialLot };
                MESRoot<object> root = new MESRoot<object>()
                {
                    From = "WMS",
                    DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Content = obj
                };
                JsonSerializerSettings settings = new JsonSerializerSettings
                {
                    ContractResolver = new CamelCasePropertyNamesContractResolver()
                };
                string request = JsonConvert.SerializeObject(root, settings);
                string response = HttpMesHelper.Post(apiInfo.ApiAddress, request);
                MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
                //调用接口
                if (mesResponseContent.BSucc == true)
                {
                    content.OK(mesResponseContent.StrMsg, mesResponseContent.Content);
                }
                else
                {
                    content.Error(mesResponseContent.StrMsg);
                }
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }

        public WebResponseContent PPTaskMove(string palletCode, string startPoint, int warehouseId, List<string> serNums)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehouseId);
                if (warehouse == null)
                {
                    return WebResponseContent.Instance.Error($"未找到该仓库信息");
                }

                Dt_Task task = Repository.QueryFirst(x => x.PalletCode == palletCode && x.WarehouseId == warehouseId);
                if (task != null)
                {
                    return WebResponseContent.Instance.Error($"该托盘已生成任务");
                }

                List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.PPPKSerNumAnalysis, serNums);
                //验证判断时间格式
                WebResponseContent IsValidContent = IsValidMCDates(models);
                if (!IsValidContent.Status)
                {
                    return content.Error(IsValidContent.Message);
                }

                Dt_Task newTask = new Dt_Task()
                {
                    CurrentAddress = startPoint,
                    Grade = 0,
                    NextAddress = "PPCuttingWarehouse",
                    PalletCode = palletCode,
                    Roadway = "AGV_PP",
                    SourceAddress = startPoint,
                    TargetAddress = "PPCuttingWarehouse",
                    TaskType = TaskTypeEnum.MesPPMove.ObjToInt(),
                    TaskStatus = TaskStatusEnum.New.ObjToInt(),
                    WarehouseId = warehouseId,
                    PalletType = 0,
                    MaterielCode = models.FirstOrDefault()?.MaterielCode,
                    Quantity = (float)models.FirstOrDefault()?.Quantity,
                    BatchNo = models.FirstOrDefault()?.LotNo
                };
                if (palletCode.Contains("DJ"))
                {
                    newTask.PalletType = 2;
                }
                else if (palletCode.Contains("XJ"))
                {
                    newTask.PalletType = 1;
                }
                else
                {
                    return WebResponseContent.Instance.Error("该托盘码错误，或不属于PP平库");
                }
                _unitOfWorkManage.BeginTran();
                int taskId = BaseDal.AddData(newTask);
                newTask.TaskId = taskId;
                _unitOfWorkManage.CommitTran();
                PushTasksToWCS(new List<Dt_Task> { newTask }, "AGV_PP");
                content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
        }

        public WebResponseContent IsValidMCDates(List<MatSerNumAnalysisModel> analysisModels)
        {
            string[] effDates = analysisModels.Select(x => x.EffectiveDate).Distinct().ToArray();
            string[] ProDates = analysisModels.Select(x => x.ProductionDate).Distinct().ToArray();
            foreach (string effDate in effDates)
            {
                string format = "yyyy-MM-dd"; // ç›®æ ‡æ ¼å¼
                DateTime parsedDate;
                // è§£æžå¹¶éªŒè¯æ ¼å¼
                bool isValid = DateTime.TryParseExact(
                    effDate,
                    format,
                    CultureInfo.InvariantCulture,
                    DateTimeStyles.None,
                    out parsedDate
                );

                if (!isValid)
                {
                    return WebResponseContent.Instance.Error("格式无效或日期不合法");
                }
            }
            foreach (string ProDate in ProDates)
            {
                string format = "yyyy-MM-dd"; // ç›®æ ‡æ ¼å¼
                DateTime parsedDate;
                // è§£æžå¹¶éªŒè¯æ ¼å¼
                bool isValid = DateTime.TryParseExact(
                    ProDate,
                    format,
                    CultureInfo.InvariantCulture,
                    DateTimeStyles.None,
                    out parsedDate
                );

                if (!isValid)
                {
                    return WebResponseContent.Instance.Error("格式无效或日期不合法");
                }
            }
            return WebResponseContent.Instance.OK();
        }
    }
}