From 82caba9b690a8dbe672e93039f31931c9dc4205c Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期三, 22 四月 2026 18:01:22 +0800
Subject: [PATCH] 1
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Const/HtmlElementType.cs | 5 +-
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue | 4 +-
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue | 4 +-
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs | 3 +
Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs | 64 ++++++++++++++++----------------
Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx | 4 +-
6 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue b/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
index 35acdd8..43a2580 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
+++ b/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",
},
{
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue b/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue
index 3832761..bdc59cf 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue
+++ b/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",
},
{
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Const/HtmlElementType.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Const/HtmlElementType.cs
index 0120ac2..af508eb 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Const/HtmlElementType.cs
+++ b/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 = "!=";
}
}
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs
index 8a5b4a3..91731e2 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs
+++ b/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;
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx
index 520dcd1..3adeaf6 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/groupPalle.jsx
+++ b/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) {
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs
index bff8aeb..02f1d71 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs
@@ -1,33 +1,33 @@
-锘縰sing 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 = "=";
+锘縰sing 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 = "!=";
- }
-}
+ }
+}
--
Gitblit v1.9.3