From 1e9434892fd87b5a99176fdfecc2cb63ddb5ab25 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 27 六月 2025 08:49:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e9f38e3..adf887f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -89,10 +89,10 @@
     @Resource
     private BasDevpMapper basDevpMapper;
 
-    @Value("mes.url")
+    @Value("${mes.url}")
     private String url;
 
-    @Value("mes.pakin")
+    @Value("${mes.code}")
     private String code;
 
     @Override
@@ -388,7 +388,7 @@
                 }
                 elem.setTemp1(codeDataParam.getQuality());
                 elem.setAnfme(codeDataParam.getQty());
-                elem.setBatch(codeDataParam.getBatchNum());
+                //elem.setBatch(codeDataParam.getBatchNum());
                 elem.setThreeCode(codeDataParam.getBarcode());
                 elem.setMatnr(codeDataParam.getProductionCode());
                 elem.setMaktx(codeDataParam.getProductionName());
@@ -475,9 +475,13 @@
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
+        log.info("getData:{}",response);
         MesResponse jsonObject = JSON.parseObject(response, MesResponse.class);
         if (jsonObject.getCode().equals(200)) {
-            return JSON.parseArray(jsonObject.getData(), CodeDataParam.class);
+            JSONObject jsonObject1 = JSON.parseObject(jsonObject.getData());
+            if (jsonObject1.getString("barcodeList")!=null){
+                return JSON.parseArray(jsonObject1.getString("barcodeList"), CodeDataParam.class);
+            }
         }
         throw new CoolException(jsonObject.getMessage());
     }

--
Gitblit v1.9.1