1
xiazhengtongxue
2 天以前 82caba9b690a8dbe672e93039f31931c9dc4205c
1
已修改6个文件
84 ■■■■ 文件已修改
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Const/HtmlElementType.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
@@ -160,14 +160,14 @@
        field: "deviceIp",
        title: "设备IP",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
      },
      {
        field: "devicePort",
        title: "设备端口",
        type: "int",
        width: 120,
        width: 90,
        align: "left",
      },
      {
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue
@@ -142,7 +142,7 @@
        field: "name",
        title: "任务名称",
        type: "string",
        width: 120,
        width: 150,
        align: "left",
      },
      {
@@ -171,7 +171,7 @@
        field: "intervalSecond",
        title: "执行间隔时间",
        type: "int",
        width: 120,
        width: 90,
        align: "left",
      },
      {
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Const/HtmlElementType.cs
@@ -16,7 +16,7 @@
        public const string textarea = "textarea";
        public const string thanorequal = "thanorequal";
        public const string lessorequal = "lessorequal";
        public const string notequal = "notequal";
        public const string gt = "gt";
        public const string lt = "lt";
@@ -27,6 +27,7 @@
        public const string ThanOrEqual = ">=";
        public const string LessOrEqual = "<=";
        public const string Contains = "in";
        public const string Equal = "=";
        public const string Equal = "=";
        public const string NotEqual = "!=";
    }
}
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs
@@ -548,6 +548,9 @@
                    break;
                case HtmlElementType.like:
                    linqExpression = LinqExpressionType.Contains;
                    break;
                case HtmlElementType.notequal:
                    linqExpression = LinqExpressionType.NotEqual;
                    break;
                default:
                    linqExpression = LinqExpressionType.Equal;
Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx
@@ -101,8 +101,8 @@
    },
    searchBefore(param) {
      const stockStatusFilter = {
        name: "stockStatus",
        value: "1",
        name: "LocationId",
        value: "0",
        displayType: "int"
      };
      if (!param.wheres) {
Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs
@@ -1,33 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WIDESEA_Core.Const
{
    public struct HtmlElementType
    {
        public const string drop = "drop";
        public const string droplist = "droplist";
        public const string select = "select";
        public const string selectlist = "selectlist";
        public const string checkbox = "checkbox";
        public const string textarea = "textarea";
        public const string thanorequal = "thanorequal";
        public const string lessorequal = "lessorequal";
        public const string notequal = "notequal";
        public const string gt = "gt";
        public const string lt = "lt";
        public const string GT = ">";
        public const string LT = "<";
        public const string like = "like";
        public const string ThanOrEqual = ">=";
        public const string LessOrequal = "<=";
        public const string Contains = "in";
        public const string Equal = "=";
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WIDESEA_Core.Const
{
    public struct HtmlElementType
    {
        public const string drop = "drop";
        public const string droplist = "droplist";
        public const string select = "select";
        public const string selectlist = "selectlist";
        public const string checkbox = "checkbox";
        public const string textarea = "textarea";
        public const string thanorequal = "thanorequal";
        public const string lessorequal = "lessorequal";
        public const string notequal = "notequal";
        public const string gt = "gt";
        public const string lt = "lt";
        public const string GT = ">";
        public const string LT = "<";
        public const string like = "like";
        public const string ThanOrEqual = ">=";
        public const string LessOrequal = "<=";
        public const string Contains = "in";
        public const string Equal = "=";
        public const string NotEqual = "!=";
    }
}
    }
}