From 5a864aeb422c8d601b40603afb4b4e8709361a7f Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Sat, 15 Jun 2024 09:48:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8C=85=E8=A3=85=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/wms/pdm/workerorder/ProductionOrder.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue
index 862b37c..96ae489 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue
@@ -29,11 +29,13 @@
+
+
-
+
- {{scope.row.forder_SUBNUM - scope.row.guadansum}}
+ {{ scope.row.forder_SUBNUM - scope.row.guadansum }}
From 71d7737f3ac4a008f3431c771f500fed95dbee4e Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 17 Jun 2024 09:52:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=AE=A1=E7=AE=97=E5=8C=85=E8=A3=85?=
=?UTF-8?q?=E6=95=B0=E9=87=8F=E5=8E=BB=E9=99=A4=E5=A4=B4=E5=B0=BE=E7=A9=BA?=
=?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
index 842d715..9a141a2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
@@ -210,8 +210,9 @@ public class TaskUtils {
* @return
*/
public static int convertMultiply(String needFullNumberStr) {
+ String trim = needFullNumberStr.trim();
// 使用 "*" 来分割字符串
- String[] parts = needFullNumberStr.split("\\*");
+ String[] parts = trim.split("\\*");
// 初始化结果为1
int result = 1;
for (String part : parts) {