Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
@@ -45,26 +45,16 @@
        try
        {
            // 判断需不需要去包装,不需要就去常温三
            var stationManagers = _stationManagerRepository.QueryData(x => x.stationPLC == "1018" && x.stationArea == "Cache" && x.productLine == input.ProductionLine);
            //var stationManagers = _stationManagerRepository.QueryData(x => x.stationPLC == "1018" && x.stationArea == "Cache" && x.productLine == input.ProductionLine);
            var STATION = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
            //var STATION = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
            //var station = stationManagers.Select(x => x.stationChildCode).ToList();
            //// 获取WCSip地址相关配置
            // 获取WCSip地址相关配置
            var wcsIpAddrss = GetWCSIpAddress();
            //if (wcsIpAddrss == null)
            //{
            //    throw new InvalidOperationException("WCS IP 未配置");
            //}
            //var abc = HttpHelper.PostAsync(wcsIpAddrss, station.ToJsonString()).Result;
            //content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
            //var num = content.Data.ObjToInt();
            //如果当前库内存在比当前时间的对应产线的料 则入库至常温3
            DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(x => x.AreaCode == "CWSC3" && x.IsFull == true && x.ProductionLine == STATION.productLine && x.OutboundTime < DateTime.Now);
            if (stockInfo != null)
            //DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(x => x.AreaCode == "CWSC3" && x.IsFull == true && x.ProductionLine == STATION.productLine && x.OutboundTime < DateTime.Now);
            //if (stockInfo != null)
            {
                var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
                var strings = config.ConfigValue.Split(',').ToList();
@@ -79,32 +69,34 @@
            // TODO 判断在途数量
            var needBarcode = await SqlSugarHelper.DbWCS.Queryable<dt_needBarcode>().FirstAsync(x => x.productLine == STATION.productLine && x.fromArea == "CW");
            var needCount = needBarcode.inLineNum = BaseDal.QueryData(x => x.TargetAddress == STATION.stationChildCode).Count();
            //var count = BaseDal.QueryData(x => x.TargetAddress == stationManagers[0].Roadway).Count;
            if (needCount < needBarcode.cacheNum)
            {
                // 送至包装
                List<string> strings = stationManagers.Where(x => x.stationType == 0 && x.productLine == input.ProductionLine).Select(x => x.Roadway).ToList();
                var x = await SqlSugarHelper.DbWCS.Updateable<dt_needBarcode>()
                    .SetColumns(x => x.inLineNum == x.inLineNum + 1)
                    .Where(x => x.id == needBarcode.id).ExecuteCommandHasChangeAsync();
                ConsoleHelper.WriteSuccessLine($"在途数量添加{(x ? "成功" : "失败")}数量+1,当前工序{boxing.ProcessCode},产线{input.ProductionLine}");
                LogFactory.GetLog("OCVB").InfoFormat(true, $"在途数量添加{(x ? "成功" : "失败")}数量+1,当前工序{boxing.ProcessCode},产线{input.ProductionLine}", "无参数");
                return await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings, 3);
            }
            else
            {
                var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
                var strings = config.ConfigValue.Split(',').ToList();
                // 入库送至常温3
                var resultContent = await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings);
                if (resultContent.Status)
                {
                    await _boxingInfoRepository.AddDataNavAsync(boxing);
                }
                return resultContent;
            }
            #region OCV常温3直接去包装路径不通此逻辑不需要
            //var needBarcode = await SqlSugarHelper.DbWCS.Queryable<dt_needBarcode>().FirstAsync(x => x.productLine == STATION.productLine && x.fromArea == "CW");
            //var needCount =  BaseDal.QueryData(x => x.TargetAddress == needBarcode.toArea).Count();
            //if (needCount < needBarcode.cacheNum)
            //{
            //    // 送至包装
            //    List<string> strings = stationManagers.Where(x => x.stationType == 0 && x.productLine == input.ProductionLine).Select(x => x.Roadway).ToList();
            //    var x = await SqlSugarHelper.DbWCS.Updateable<dt_needBarcode>()
            //        .SetColumns(x => x.inLineNum == x.inLineNum + 1)
            //        .Where(x => x.id == needBarcode.id).ExecuteCommandHasChangeAsync();
            //    ConsoleHelper.WriteSuccessLine($"在途数量添加{(x ? "成功" : "失败")}数量+1,当前工序{boxing.ProcessCode},产线{input.ProductionLine}");
            //    LogFactory.GetLog("OCVB").InfoFormat(true, $"在途数量添加{(x ? "成功" : "失败")}数量+1,当前工序{boxing.ProcessCode},产线{input.ProductionLine}", "无参数");
            //    return await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings, 3);
            //}
            //else
            //{
            //    var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
            //    var strings = config.ConfigValue.Split(',').ToList();
            //    // 入库送至常温3
            //    var resultContent = await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings);
            //    if (resultContent.Status)
            //    {
            //        await _boxingInfoRepository.AddDataNavAsync(boxing);
            //    }
            //    return resultContent;
            //}
            #endregion
        }
        catch (Exception ex)
        {