From 58652618b0776f3ebe271c6a0f585e4a0dc60877 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 25 九月 2025 16:43:16 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 d253f7a..581552b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -71,6 +71,8 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private MatBarcodeService matBarcodeService;
@Override
@@ -110,7 +112,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getProType(),elem.getTemp2());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getProType(),elem.getTemp2(),elem.getOutOrderNo());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -126,10 +128,23 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+ //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
+ MatBarcode matBarcode = new MatBarcode();
+ MatBarcode mb=matBarcodeService.selectbyMatnr(detlDto.getMatnr());
+ if (mb != null && !mb.getZpallet().equals(param.getBarcode())){
+ throw new CoolException(detlDto.getMatnr()+"璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
+ }else{
+ matBarcode.setZpallet(param.getBarcode());//鎵樼洏鐮�
+ matBarcode.setMatnr(mat.getMatnr());//鐗╂枡鍙�
+ matBarcode.setMaktx(mat.getMaktx());//鐗╂枡鍚嶇О
+ matBarcode.setSpecs(mat.getSpecs());//瑙勬牸
+ matBarcode.setModel(mat.getModel());//鍨嬪彿
+ }
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setProType(detlDto.getProType());
waitPakin.setTemp2(detlDto.getTemp2());
+ waitPakin.setOutOrderNo(detlDto.getOutOrderNo());
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -141,6 +156,9 @@
waitPakin.setModiTime(now);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ if (!matBarcodeService.insert(matBarcode)){
+ throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
}
}
// 鍏宠仈缁勬墭
@@ -169,6 +187,18 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+ //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
+ MatBarcode matBarcode = new MatBarcode();
+ MatBarcode mb=matBarcodeService.selectbyMatnr(orderDetl.getMatnr());
+ if (mb != null && !mb.getZpallet().equals(param.getBarcode())){
+ throw new CoolException(orderDetl.getMatnr()+"璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
+ }else{
+ matBarcode.setZpallet(param.getBarcode());//鎵樼洏鐮�
+ matBarcode.setMatnr(mat.getMatnr());//鐗╂枡鍙�
+ matBarcode.setMaktx(mat.getMaktx());//鐗╂枡鍚嶇О
+ matBarcode.setSpecs(mat.getSpecs());//瑙勬牸
+ matBarcode.setModel(mat.getModel());//鍨嬪彿
+ }
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
@@ -191,6 +221,9 @@
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
+ if (!matBarcodeService.insert(matBarcode)){
+ throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
+ }
});
orderService.updateSettle(order.getId(), 2L, userId);
--
Gitblit v1.9.1