From 29204b9c5c5b29201dbf55344524e51f654e931c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 25 三月 2026 11:06:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/timer/WmsDataTimer.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/timer/WmsDataTimer.java b/src/main/java/com/zy/asrs/timer/WmsDataTimer.java
index be1dd03..f8148c7 100644
--- a/src/main/java/com/zy/asrs/timer/WmsDataTimer.java
+++ b/src/main/java/com/zy/asrs/timer/WmsDataTimer.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
@Component
@@ -56,6 +57,9 @@
if (wcsStationDto == null) {
continue;
}
+ if(Cools.isEmpty(wcsStationDto.getTaskNo())){
+ continue;
+ }
if (wcsStationDto.getAuto() != 1
|| wcsStationDto.getLoading() != 1
@@ -79,13 +83,14 @@
for (Object o : data.getJSONArray("wrkDetls")) {
JSONObject wrkDetl = (JSONObject) o;
TvWrkDetlDto tvWrkDetlDto = new TvWrkDetlDto();
- list.add(tvWrkDetlDto);
+// list.add(tvWrkDetlDto);
tvWrkDetlDto.setMatnr(wrkDetl.getString("matnr"));
tvWrkDetlDto.setMaktx(wrkDetl.getString("maktx"));
tvWrkDetlDto.setSpecs(wrkDetl.getString("specs"));
tvWrkDetlDto.setBatch(wrkDetl.getString("batch"));
tvWrkDetlDto.setAnfme(wrkDetl.getDouble("anfme"));
+ list.add(tvWrkDetlDto);
}
wcsStationDto.setIoType(data.getInteger("ioType"));
@@ -128,8 +133,12 @@
if (Cools.isEmpty(wcsStationDto.getBarcode())) {
continue;
}
-
- requestParam.put("barcode", wcsStationDto.getBarcode());
+ String[] split = wcsStationDto.getBarcode().split(",");
+ String barcode = split[0];
+ if(Objects.equals(barcode, "NoRead")){
+ continue;
+ }
+ requestParam.put("barcode", barcode);
response = new HttpHandler.Builder()
.setUri(wmsCombQueryUrl)
.setJson(JSON.toJSONString(requestParam))
@@ -139,22 +148,29 @@
if (response != null) {
JSONObject jsonObject = JSON.parseObject(response);
JSONObject data = jsonObject.getJSONObject("data");
-
+ if(data == null){
+ continue;
+ }
List<TvWrkDetlDto> list = new ArrayList<>();
- for (Object o : data.getJSONArray("combDetls")) {
+ for (Object o : data.getJSONArray("waitPakins")) {
JSONObject wrkDetl = (JSONObject) o;
TvWrkDetlDto tvWrkDetlDto = new TvWrkDetlDto();
- list.add(tvWrkDetlDto);
+// list.add(tvWrkDetlDto);
tvWrkDetlDto.setMatnr(wrkDetl.getString("matnr"));
tvWrkDetlDto.setMaktx(wrkDetl.getString("maktx"));
tvWrkDetlDto.setSpecs(wrkDetl.getString("specs"));
tvWrkDetlDto.setBatch(wrkDetl.getString("batch"));
tvWrkDetlDto.setAnfme(wrkDetl.getDouble("anfme"));
- }
+ tvWrkDetlDto.setBarcode(barcode);
+ tvWrkDetlDto.setLocNo(wrkDetl.getString("zpallet"));
+ list.add(tvWrkDetlDto);
+ }
wcsStationDto.setIoType(1);
+ wcsStationDto.setBarcode(barcode);
wcsStationDto.setWrkDetls(list);
+ System.out.println(wcsStationDto);
stationUtils.stationMap.put(wcsStationDto.getStationId(), wcsStationDto);
}
}
--
Gitblit v1.9.1