`

liudl

2025-01-17 af15096c2336e2916076231af13caa7d92974949

`

 Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs

@@ -132,6 +132,11 @@
    public string? StationNum { get; set; }

    /// <summary>
    /// 交互类型
    /// </summary>
    public DeviceTypeEnum?  DeviceType { get; set; }

    /// <summary>
    /// 描述
    /// </summary>
    public string? Text { get; set; }

 Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs

@@ -6,6 +6,7 @@
using System.Drawing.Drawing2D;
using WCS.Application.Entity;
using WCS.Application.Service.WcsDevice.Dto;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinComponentApiGetAuthorizerInfoResponse.Types.Authorizer.Types;

namespace WCS.Application;

@@ -115,7 +116,7 @@
                modPlc = plcList.FirstOrDefault(m => m.Text == "1层托盘输送线");
                if (modPlc == null)
                    throw Oops.Bah($"未查询到{input.Layer}楼层PLC信息");
                DbNum = "";
                DbNum = "DB1100";
                break;
            case "2":
                modPlc = plcList.FirstOrDefault(m => m.Text == "2层托盘输送线");
@@ -127,7 +128,7 @@
                modPlc = plcList.FirstOrDefault(m => m.Text == "3层托盘输送线");
                if (modPlc == null)
                    throw Oops.Bah($"未查询到{input.Layer}楼层PLC信息");
                DbNum = "";
                DbNum = "DB1100";
                break;
            default:
                throw Oops.Bah("楼层信息错误");
@@ -747,6 +748,7 @@
            .WhereIF(input.PlcId > 0, u => u.PlcId == input.PlcId)
            .WhereIF(!string.IsNullOrWhiteSpace(input.StationNum), u => u.StationNum.Contains(input.StationNum.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Text), u => u.Text.Contains(input.Text.Trim()))
            .WhereIF(input.DeviceType.HasValue, u => u.DeviceType == input.DeviceType)
            //处理外键和TreeSelector相关字段的连接
            .LeftJoin<WcsPlc>((u, plcid) => u.PlcId == plcid.Id)
            .Select((u, plcid) => new WcsDeviceOutput

 Web/src/views/wcs/wcsDevice/index.vue

@@ -20,6 +20,15 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="业务类型">
              <el-select clearable="" filterable="" v-model="queryParams.deviceType" placeholder="业务类型">
                <el-option v-for="(item,index) in dl('DeviceTypeEnum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" />

              </el-select>

            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="工位号">
              <el-input v-model="queryParams.stationNum" clearable="" placeholder="请输入工位号" />