合并

wanshenmean

2025-04-16 29f20b28392d212c04c0c40a512894f8622cfa53

 CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -1,5 +1,6 @@
using Mapster;
using Masuit.Tools;
using SixLabors.Fonts.Tables.AdvancedTypographic;
using SqlSugar;
using System.Text.RegularExpressions;
using WIDESEA_Cache;
@@ -871,6 +872,8 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            // 记录异常信息并抛出
            LogFactory.GetLog($"{position}请求{productionLine}任务").Info(true, $"{position}-{tag}-{areaCode}-{JsonConvert.SerializeObject(areaCodes)}-{productionLine}");
            // 根据托盘类型查询库存信息
            DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
                ? areaCode != "CWSC1" ? await QueryStockInfoForRealTrayAsync(areaCode, areaCodes, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine)
@@ -1199,15 +1202,15 @@
            if (stockInfo.AreaCode.Contains("CH"))
            {
                // 创建并添加任务到数据库
                task = CreateTask(stockInfo, "1020-1", taskType);
                task = CreateTask(stockInfo, "002-071-001", taskType);
            }
            else
            {
                if (stockInfo.LocationInfo.RoadwayNo.Contains("JZSC"))
                {
                    var targetAddress = "002-021-001";
                    if (stockInfo.LocationInfo.RoadwayNo == "JZSC4")
                        targetAddress = "001-021-001";
                    var targetAddress = "001-061-001";
                    //if (stockInfo.LocationInfo.RoadwayNo == "JZSC4")
                    //    targetAddress = "001-021-001";
                    task = CreateTask(stockInfo, targetAddress, taskType);
                }
            }
@@ -1574,7 +1577,7 @@
    #endregion 外部接口方法

    #region  静置查询实托
    public async Task<WebResponseContent> QueryStockInfoForRealTrayJZAsync(string ProductLine)
    public async Task<WebResponseContent> QueryStockInfoForRealTrayJZAsync(string ProductLine, string PalletCode)
    {
        WebResponseContent content = new WebResponseContent();
        try
@@ -1597,6 +1600,7 @@
                content.Error();
            else
                content.OK();
            LogFactory.GetLog($"静置查询实盘库存{ProductLine}").Info(true, $"托盘号：{JsonConvert.SerializeObject(result.PalletCode)}-----产线{JsonConvert.SerializeObject(result.ProductionLine)}");
        }
        catch (Exception ex)
        {