From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 adf887f..f638366 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -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());
@@ -327,7 +331,7 @@
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode())
.eq("io_status", "N")
- .eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch())) > 0) {
+ .eq("matnr", elem.getMatnr()).eq("three_code",elem.getThreeCode()).eq("batch", elem.getBatch())) > 0) {
throw new CoolException(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());
}
@@ -383,9 +387,7 @@
//for (CombParam.CombMat elem : param.getCombMats()) {
CombParam.CombMat elem = combMats.get(i);
CodeDataParam codeDataParam = data.get(i);
- if (!codeDataParam.getQuality().equals(order.getShipCode())) {
- throw new CoolException("鍗曟嵁璐ㄩ噺鐘舵�佸拰缁勬墭鐗╂枡涓嶅尮閰�");
- }
+
elem.setTemp1(codeDataParam.getQuality());
elem.setAnfme(codeDataParam.getQty());
//elem.setBatch(codeDataParam.getBatchNum());
@@ -399,6 +401,9 @@
if (Cools.isEmpty(orderDetl)) {
throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
}
+ if (!codeDataParam.getQuality().equals(orderDetl.getInspect())) {
+ throw new CoolException("鍗曟嵁璐ㄩ噺鐘舵�佸拰缁勬墭鐗╂枡涓嶅尮閰�");
+ }
if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
@@ -409,11 +414,11 @@
// 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)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+ DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getFromOrderNo());
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
} else {
@@ -475,11 +480,11 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- log.info("getData:{}",response);
+ log.info("getData:{}", response);
MesResponse jsonObject = JSON.parseObject(response, MesResponse.class);
if (jsonObject.getCode().equals(200)) {
JSONObject jsonObject1 = JSON.parseObject(jsonObject.getData());
- if (jsonObject1.getString("barcodeList")!=null){
+ if (jsonObject1.getString("barcodeList") != null) {
return JSON.parseArray(jsonObject1.getString("barcodeList"), CodeDataParam.class);
}
}
--
Gitblit v1.9.1