From fcc71e5d0f0eba3f192c581fad184cee0a43ce99 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 10 四月 2026 16:37:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/timer/WmsDataTimer.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/timer/WmsDataTimer.java b/src/main/java/com/zy/asrs/timer/WmsDataTimer.java
index f8166ca..2c1b88b 100644
--- a/src/main/java/com/zy/asrs/timer/WmsDataTimer.java
+++ b/src/main/java/com/zy/asrs/timer/WmsDataTimer.java
@@ -82,10 +82,14 @@
                         list.add(tvWrkDetlDto);
 
                         tvWrkDetlDto.setMatnr(wrkDetl.getString("matnr"));
+                        tvWrkDetlDto.setOrderNo(wrkDetl.getString("orderNo"));
+                        tvWrkDetlDto.setQty(wrkDetl.getDouble("units"));
                         tvWrkDetlDto.setMaktx(wrkDetl.getString("maktx"));
+                        tvWrkDetlDto.setLocNo(wrkDetl.getString("boxType1"));
                         tvWrkDetlDto.setSpecs(wrkDetl.getString("specs"));
                         tvWrkDetlDto.setBatch(wrkDetl.getString("batch"));
                         tvWrkDetlDto.setAnfme(wrkDetl.getDouble("anfme"));
+                        tvWrkDetlDto.setSource(wrkDetl.getInteger("source")!=1?"杞":"杞鎶よ偆鍖呰");
                     }
 
                     wcsStationDto.setIoType(data.getInteger("ioType"));
@@ -141,16 +145,20 @@
                     JSONObject data = jsonObject.getJSONObject("data");
 
                     List<TvWrkDetlDto> list = new ArrayList<>();
-                    for (Object o : data.getJSONArray("combDetls")) {
+                    for (Object o : data.getJSONArray("wrkDetls")) {
                         JSONObject wrkDetl = (JSONObject) o;
                         TvWrkDetlDto tvWrkDetlDto = new TvWrkDetlDto();
                         list.add(tvWrkDetlDto);
 
                         tvWrkDetlDto.setMatnr(wrkDetl.getString("matnr"));
+                        tvWrkDetlDto.setOrderNo(wrkDetl.getString("orderNo"));
+                        tvWrkDetlDto.setQty(wrkDetl.getDouble("anfme"));
                         tvWrkDetlDto.setMaktx(wrkDetl.getString("maktx"));
+                        tvWrkDetlDto.setLocNo(wrkDetl.getString("locNo"));
                         tvWrkDetlDto.setSpecs(wrkDetl.getString("specs"));
                         tvWrkDetlDto.setBatch(wrkDetl.getString("batch"));
                         tvWrkDetlDto.setAnfme(wrkDetl.getDouble("anfme"));
+                        tvWrkDetlDto.setSource(wrkDetl.getInteger("source")!=1?"杞":"杞鎶よ偆鍖呰");
                     }
 
                     wcsStationDto.setIoType(1);

--
Gitblit v1.9.1