Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

刘磊

2024-11-20 2db8aa13565b87f9c92b94021b71020490a217de

Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs

@@ -25,6 +25,11 @@
        /// IP接口地址
        /// </summary>
        public const string CONFIG_SYS_IPAddress = "CONFIG_SYS_IPAddress";

        /// <summary>
        /// MOM接口地址
        /// </summary>
        public const string SYS_MOMIPAddress = "SYS_MOMIPAddress";
    }

    /// <summary>
@@ -75,5 +80,45 @@
        /// HK IP
        /// </summary>
        public const string HKIPAddress = "HKIPAddress";

        /// <summary>
        /// MOMIP地址
        /// </summary>
        public const string MOMBaseIP = "MOMBaseIP";

        /// <summary>
        /// å•ç”µèŠ¯å±žæ€§èŽ·å–
        /// </summary>
        public const string CellState = "CellState";

        /// <summary>
        /// æ•´ç›˜ç”µèŠ¯å±žæ€§èŽ·å–
        /// </summary>
        public const string TrayCellsStatus = "TrayCellsStatus";

        /// <summary>
        /// é™ç½®\陈化入库（整托盘）
        /// </summary>
        public const string AgingInput = "AgingInput";

        /// <summary>
        /// é™ç½®\陈化出库（整托盘）
        /// </summary>
        public const string AgingOutput = "AgingOutput";

        /// <summary>
        /// å·¥è‰ºè·¯çº¿ç”³è¯·
        /// </summary>
        public const string ProcessApply = "ProcessApply";

        /// <summary>
        /// æ‰˜ç›˜å•ç”µèŠ¯è§£ç»‘
        /// </summary>
        public const string TrayCellUnbind = "TrayCellUnbind";

        /// <summary>
        /// æ•´ç›˜ç”µèŠ¯è§£ç»‘
        /// </summary>
        public const string TrayUnbind = "TrayUnbind";
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_AreaInfo.cs

@@ -58,21 +58,21 @@
       
     
        /// <summary>
        /// å¤‡  æ³¨:
        /// å¤‡  æ³¨: åŒºåŸŸç‚¹ä½
        /// é»˜è®¤å€¼:
        ///</summary>
        [SugarColumn(ColumnName="Spare1" ) ]
        public string? Spare1  { get; set;  } 
     
        /// <summary>
        /// å¤‡  æ³¨:
        /// å¤‡  æ³¨: å¯¹åº”MOM区域编码
        /// é»˜è®¤å€¼:
        ///</summary>
        [SugarColumn(ColumnName="Spare2" ) ]
        public string? Spare2  { get; set;  } 
     
        /// <summary>
        /// å¤‡  æ³¨:
        /// å¤‡  æ³¨: ä¸Šä½è½¯ä»¶åç§°
        /// é»˜è®¤å€¼:
        ///</summary>
        [SugarColumn(ColumnName="Spare3" ) ]

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/AgingInOrOutInput/AgingInOrOutInputService.cs

@@ -2,8 +2,11 @@
using Masuit.Tools;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Const;
using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_IServices;
using WIDESEA_IStorageBasicService;
using WIDESEA_IStoragIntegrationServices;

namespace WIDESEA_StoragIntegrationServices;
@@ -11,6 +14,12 @@
public class AgingInOrOutInputService : IAgingInOrOutInputService
{
    private readonly LogFactory LogFactory = new LogFactory();
    private readonly ISys_ConfigService _configService;

    public AgingInOrOutInputService(ISys_ConfigService configRepository)
    {
        _configService = configRepository;
    }

    /// <summary>
    /// é™ç½®\陈化入库（整托盘）
@@ -26,11 +35,21 @@
            input.EmployeeNo = "MITest";
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputJson = input.ToDictionary();
            var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/AgingInput", inputJson);
            content.OK(data: x);
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.AgingInput)?.ConfigValue;
            if (wmsBase == null || ipAddress == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/AgingInput", inputJson);
            content.OK(data: result);

            LogFactory.GetLog("静置陈化入库（整托盘）").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置陈化入库（整托盘）").Info(true, x);
            LogFactory.GetLog("静置陈化入库（整托盘）").Info(true, result);
        }
        catch (Exception err)
        {
@@ -55,10 +74,20 @@
            input.EmployeeNo = "MITest";
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputJson = input.ToDictionary();
            var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/AgingOutput", inputJson);
            content.OK(data: x);
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.AgingOutput)?.ConfigValue;
            if (wmsBase == null || ipAddress == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/AgingOutput", inputJson);
            content.OK(data: result);
            LogFactory.GetLog("静置陈化出库（整托盘）").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("静置陈化出库（整托盘）").Info(true, x);
            LogFactory.GetLog("静置陈化出库（整托盘）").Info(true, result);
        }
        catch (Exception err)
        {

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs

@@ -3,9 +3,14 @@
using Newtonsoft.Json;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Const;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_IRepository;
using WIDESEA_IServices;
using WIDESEA_IStorageBasicService;
using WIDESEA_IStoragIntegrationServices;
using static Org.BouncyCastle.Math.EC.ECCurve;

namespace WIDESEA_StoragIntegrationServices;

@@ -14,10 +19,12 @@
    private readonly LogFactory LogFactory = new LogFactory();

    private readonly IBoxingInfoService _boxingInfoService;
    private readonly ISys_ConfigService _configService;

    public CellStateService(IBoxingInfoService boxingInfoService)
    public CellStateService(IBoxingInfoService boxingInfoService, ISys_ConfigService configRepository)
    {
        _boxingInfoService = boxingInfoService;
        _configService = configRepository;
    }

    /// <summary>
@@ -34,7 +41,17 @@
            input.EmployeeNo = "MITest";
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputJson = input.ToDictionary();
            var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/CellState", inputJson);
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.CellState)?.ConfigValue; 
            if (wmsBase == null || ipAddress == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/CellState", inputJson);
            #region
            //if (x != null)
            //{
@@ -65,8 +82,8 @@
            #endregion

            LogFactory.GetLog("单电芯属性获取").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("单电芯属性获取").Info(true, x);
            return x;
            LogFactory.GetLog("单电芯属性获取").Info(true, result);
            return result;
        }
        catch (Exception err)
        {
@@ -93,36 +110,21 @@
            input.EmployeeNo = "MITest";
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputJson = input.ToDictionary();
            var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/TrayCellsStatus", inputJson);
            if (x != null)
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.TrayCellsStatus)?.ConfigValue;
            if (wmsBase == null || ipAddress == null)
            {
                // ååºåˆ—化ResultTrayCellsStatus对象
                //ResultTrayCellsStatus result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(x);

                //// åˆ›å»ºDtBoxingInfo对象
                //DtBoxingInfo boxingInfo = new DtBoxingInfo
                //{
                //    IsFull = true,
                //    PalletCode = result.TrayBarcode,
                //};

                //// ä½¿ç”¨LINQ创建DtBoxingInfoDetail对象列表
                //var details = result.SerialNos.Select(item => new DtBoxingInfoDetail
                //{
                //    SerialNumber = item.SerialNo,
                //    OrderNo = item.PositionNo.ToString(),
                //    Status = item.SerialNoStatus,
                //    Remark = result.TrayBarcodePropertys.ToJsonString(),
                //    MaterielCode = result.BindCode,
                //}).ToList();

                //// èµ‹å€¼DtBoxingInfoDetails
                //boxingInfo.BoxingInfoDetails = details;
                //var abc = await _boxingInfoService.AddBoxingInfoAsync(boxingInfo);
                content.OK("组盘成功", x);
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/TrayCellsStatus", inputJson);

            LogFactory.GetLog("整盘电芯属性获取").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("整盘电芯属性获取").Info(true, x);
            LogFactory.GetLog("整盘电芯属性获取").Info(true, result);
            content.OK(data: result);
        }
        catch (Exception err)
        {

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs

@@ -3,8 +3,10 @@
using Newtonsoft.Json;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Const;
using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;

namespace WIDESEA_StoragIntegrationServices;
@@ -12,6 +14,12 @@
public class ProcessApplyService : IProcessApplyService
{
    private readonly LogFactory LogFactory = new LogFactory();
    private readonly ISys_ConfigService _configService;

    public ProcessApplyService(ISys_ConfigService configRepository)
    {
        _configService = configRepository;
    }

    /// <summary>
    /// å·¥è‰ºè·¯çº¿ç”³è¯·
@@ -26,15 +34,25 @@
            input.SessionId = Guid.NewGuid().ToString();
            input.EmployeeNo = "MITest";
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputIson = input.ToDictionary();
            var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/ProcessApply", inputIson);
            if (x != null)
            var inputJson = input.ToDictionary();
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ProcessApply)?.ConfigValue;
            if (wmsBase == null || ipAddress == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/ProcessApply", inputJson);
            if (result != null)
            {
                //var ResultProcess = JsonConvert.DeserializeObject<ResultProcessApply>(x);
                content.OK(data: x);
                content.OK(data: result);
            }
            LogFactory.GetLog("工艺路线申请").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("工艺路线申请").Info(true, x);
            LogFactory.GetLog("工艺路线申请").Info(true, result);
        }
        catch (Exception ex)
        {

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Unbind/UnbindService.cs

@@ -7,7 +7,9 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common;
using WIDESEA_Core.Const;
using WIDESEA_DTO;
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;

namespace WIDESEA_StoragIntegrationServices;
@@ -15,6 +17,12 @@
public class UnbindService : IUnbindService
{
    private readonly LogFactory LogFactory = new LogFactory();
    private readonly ISys_ConfigService _configService;

    public UnbindService(ISys_ConfigService configRepository)
    {
        _configService = configRepository;
    }

    /// <summary>
    /// æ‰˜ç›˜å•ç”µèŠ¯è§£ç»‘
@@ -32,9 +40,19 @@
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputJson = input.ToDictionary();
            LogFactory.GetLog("托盘单电芯解绑1").Info(true, JsonConvert.SerializeObject(inputJson));
            var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/TrayCellUnbind", inputJson);
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.TrayCellUnbind)?.ConfigValue;
            if (wmsBase == null || ipAddress == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/TrayCellUnbind", inputJson);
            LogFactory.GetLog("托盘单电芯解绑").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("托盘单电芯解绑").Info(true, x);
            LogFactory.GetLog("托盘单电芯解绑").Info(true, result);
        }
        catch (Exception ex)
        {
@@ -61,9 +79,19 @@
            input.RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
            var inputJson = input.ToDictionary();
            Console.WriteLine(inputJson);
            var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/TrayUnbind", inputJson);
            var configs = _configService.GetConfigsByCategory(CateGoryConst.SYS_MOMIPAddress);
            var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.MOMBaseIP)?.ConfigValue;
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.TrayUnbind)?.ConfigValue;
            if (wmsBase == null || ipAddress == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + ipAddress;

            var result = HttpsClient.PostAsync(wmsIpAddress, inputJson).Result;
            //var x = await HttpsClient.PostAsync("http://c24-cellmi3:12020/api/MachineIntegration/TrayUnbind", inputJson);
            LogFactory.GetLog("整盘电芯解绑").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("整盘电芯解绑").Info(true, x);
            LogFactory.GetLog("整盘电芯解绑").Info(true, result);
        }
        catch (Exception ex)
        {

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -93,11 +93,11 @@
        {
            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
            {
                var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
                    .FirstAsync(x => x.EquipmentName == task.Roadway);
                var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);
                //var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
                //    .FirstAsync(x => x.EquipmentName == task.Roadway);
                //var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);

                var agingOutputDto = MapToAgingOutputDto(stock, info);
                var agingOutputDto = MapToAgingOutputDto(stock);
                content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
                ValidateResponse(content);
            }
@@ -123,31 +123,37 @@
        }
    }

    private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info)
    private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info = null)
    {
        // TODO Value值根据MOM下发的静置时间到当前时间的分钟数
        var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
        if (area == null)
        {
            throw new Exception("未找到对应的库区信息");
        }
        return new AgingOutputDto
        {
            OpFlag = 1,
            Software = "WMS",
            EquipmentCode = "24MEJQ08-1091",
            Software = area.Spare3,
            EquipmentCode = area.Spare2,
            TrayBarcode = stock.PalletCode,
            SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto
            {
                SlotNo = x.OrderNo.ToInt32(),
                SerialNo = x.SerialNumber,
                SerialNoResult = true,
                ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()
                {
                    LowerLomit = y.LowerControlLimit,
                    UpperLimit = y.UpperControlLimit,
                    ParameterResult = y.EquipmentAvailabilityFlag,
                    ParameterCode = y.ParameterCode,
                    ParameterDesc = y.Description,
                    TargetValue = y.TargetValue,
                    Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
                    DefectCode = y.UOMCode
                }).ToList()
                ParameterInfo = new List<ParameterInfo> { new ParameterInfo() { Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString() } }
                //ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()
                //{
                //    LowerLomit = y.LowerControlLimit,
                //    UpperLimit = y.UpperControlLimit,
                //    ParameterResult = y.EquipmentAvailabilityFlag,
                //    ParameterCode = y.ParameterCode,
                //    ParameterDesc = y.Description,
                //    TargetValue = y.TargetValue,
                //    Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
                //    DefectCode = y.UOMCode
                //}).ToList()
            }).ToList()
        };
    }
@@ -289,6 +295,7 @@
            // è®°å½•å¼‚常信息到控制台和日志
            Console.WriteLine(err.Message.ToString());
            LogFactory.GetLog("任务完成").Error(true, err);
            content.Error(err.Message);
        }
        return content;
    }
@@ -327,7 +334,11 @@
    private DtStockInfo CreateFullPalletStock(Dt_Task task, DtLocationInfo locationInf, DtBoxingInfo boxing)
    {
        var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
        if (loation == null)
            throw new Exception("未找到对应位置信息");
        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
        if (area == null)
            throw new Exception("未找到对应区域信息");
        var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
        boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.已入库; });
        var stock = new DtStockInfo()
@@ -350,8 +361,8 @@
                .ToList(),
            TrayBarcode = task.PalletCode,
            OpFlag = 1,
            EquipmentCode = "24MEJQ08-1091",
            Software = "WMS"
            EquipmentCode = area.Spare2,
            Software = area.Spare3
        };
        var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
        var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
@@ -452,13 +463,17 @@
                }
            }

            var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));
            if (area == null)
                return content.Error("改点位不在区域列表中存在");

            // åˆ›å»ºä¸€ä¸ªTrayCellsStatusDto对象，并赋值
            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
            {
                Software = "WMS",
                Software = area.Spare3,
                TrayBarcode = input.PalletCode,
                //EquipmentCode = "EQ_CWJZ01"
                EquipmentCode = "24MEJQ08-1091"
                EquipmentCode = area.Spare2
            };

            // è°ƒç”¨GetTrayCellStatusAsync方法，获取整盘电芯
@@ -487,6 +502,12 @@

            // å¦‚æžœprocess为null，则返回content
            if (process == null) return content;

            // å¹¶èµ‹å€¼ä¸Šä½è½¯ä»¶åç§°å’Œè®¾å¤‡ç¼–码
            process.Software = area.Spare3;
            process.EquipmentCode = area.Spare2;

            // è°ƒç”¨GetProcessApplyAsync方法，获取工艺申请

            // è°ƒç”¨_processApplyService.GetProcessApplyAsync方法，获取工艺申请
            content = await _processApplyService.GetProcessApplyAsync(process);
@@ -615,8 +636,6 @@
        // åˆ›å»ºä¸€ä¸ªProcessApplyDto对象，并赋值
        return new ProcessApplyDto()
        {
            EquipmentCode = "24MEJQ08-1091",
            Software = "WMS",
            //WipOrderNo = result.BindCode,
            SerialNos = content.SerialNos.Select(item => new SerialNos
            {

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/Logs/202408/2024-08-26_ÈÎÎñÍê³É_INFO.log

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/Logs/202408/2024-08-30_ÈÎÎñÍê³É_INFO.log

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/Logs/202408/2024-08-30_½Ó¿Ú_INFO.log

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/Logs/202408/2024-08-30_Ìí¼ÓÉú²ú³ö¿âµ¥_INFO.log

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.deps.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.exe

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.runtimeconfig.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.staticwebassets.runtime.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.xml

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/appsettings.Development.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/appsettings.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.deps.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.exe

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.runtimeconfig.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.xml

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/appsettings.Development.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/appsettings.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-arm/native/libSkiaSharp.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-arm/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-arm64/native/libSkiaSharp.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-arm64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-armel/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-mips64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-musl-arm/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-musl-arm64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-musl-x64/native/libSkiaSharp.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-musl-x64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-ppc64le/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-s390x/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-x64/native/libSkiaSharp.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-x64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/linux-x86/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/osx-arm64/native/libe_sqlite3.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/osx-x64/native/libe_sqlite3.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/osx/native/libSkiaSharp.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/web.config

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_User.tsv

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/wwwroot/css/style.css

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/wwwroot/js/anime.min.js

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/wwwroot/swg-login.html

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-arm/native/libSkiaSharp.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-arm/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-arm64/native/libSkiaSharp.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-arm64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-armel/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-mips64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-musl-arm/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-musl-arm64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-musl-x64/native/libSkiaSharp.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-musl-x64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-ppc64le/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-s390x/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-x64/native/libSkiaSharp.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-x64/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/linux-x86/native/libe_sqlite3.so

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/osx-arm64/native/libe_sqlite3.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/osx-x64/native/libe_sqlite3.dylib

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/osx/native/libSkiaSharp.dylib

Binary files differ