From adabcac45f57b611dc2401adffc8f5d3e948c2e1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 12:40:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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..b774d53 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("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
- }
+ HashMap<String, Object> comData = new HashMap<>();
param.getCombMats().forEach(elem -> {
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
@@ -301,7 +299,13 @@
.eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch())) > 0) {
throw new CoolException(param.getBarcode() + "宸叉湁鐩稿悓鏁版嵁");
}
+ if (comData.get(elem.getThreeCode()) == null) {
+ comData.put(elem.getThreeCode(), elem);
+ } else {
+ throw new CoolException(elem.getThreeCode() + "璇ユ潯鐮佹壂鐮佷簡澶氭");
+ }
});
+
if (param.getBarcode().length() != 8) {
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
@@ -371,7 +375,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
- List<String> codes=new ArrayList<>();
+ List<String> codes = new ArrayList<>();
for (CombParam.CombMat elem : param.getCombMats()) {
codes.add(elem.getThreeCode());
}
@@ -388,7 +392,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());
@@ -409,7 +413,7 @@
// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getThreeCode()
- , orderDetl.getManu(), orderDetl.getSku(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4());
+ , orderDetl.getManu(), codeDataParam.getBatchNum(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4());
detlDto.setTemp1(codeDataParam.getQuality());
detlDto.setFromOrderNo(codeDataParam.getBarcode());
if (DetlDto.has(detlDtos, detlDto)) {
@@ -475,9 +479,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