From 91121f5625da5e08c8623ac14d66c934f41e0718 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 19:30:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..2961897 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
@@ -290,9 +290,7 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if (param.getCombMats().size() > 1) {
- throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
- }
+
param.getCombMats().forEach(elem -> {
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
@@ -388,7 +386,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 +473,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