From 438528ff104d49849ecd9f6a3474fa3a5c4e9de8 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 02 四月 2026 22:35:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3b5f9d6..7813cde 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -189,6 +189,14 @@
continue;
}
+ if(Cools.isEmpty(wcsStationDto.getTaskNo())||wcsStationDto.getTaskNo().equals("0")) {
+ continue;
+ }
+
+ if (Cools.isEmpty(wcsStationDto.getWrkDetls())) {
+ continue;
+ }
+
String errorMsg = "";
if (!Cools.isEmpty(wcsStationDto.getErrorMsg())) {
errorMsg += wcsStationDto.getErrorMsg();
@@ -210,6 +218,7 @@
tvDataDto.setBarcode(wcsStationDto.getBarcode());
tvDataDto.setErrorMsg(errorMsg);
tvDataDto.setIoType(wcsStationDto.getIoType());
+ tvDataDto.setOrderNo(wcsStationDto.getOrderNo());
tvDataDto.setWrkDetls(wcsStationDto.getWrkDetls());
if (Cools.isEmpty(errorMsg)) {
@@ -223,6 +232,7 @@
map.put("data", list);
+ System.out.println(map);
return R.ok().add(map);
}
@@ -347,7 +357,6 @@
if(o == null){
return R.error();
}
-
return R.ok().add(JSON.parseObject(o.toString()));
}
--
Gitblit v1.9.1