From 1e035e59e748a047993a88389f4872b1c74fc1a4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 21 十月 2025 17:02:21 +0800
Subject: [PATCH] 出库增加商品名称搜索条件
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 167 ++++++++++++++++++++++++++++---------------------------
1 files changed, 85 insertions(+), 82 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 513ca4b..febbe53 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -105,94 +105,97 @@
Date now = new Date();
// 鏃犲崟缁勬墭
-// if (Cools.isEmpty(param.getOrderNo())) {
-//
-// // 鐢熸垚鍏ュ簱閫氱煡妗�
-// List<DetlDto> detlDtos = new ArrayList<>();
-// param.getCombMats().forEach(elem -> {
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
-// if (DetlDto.has(detlDtos, detlDto)) {
-// DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
-// assert one != null;
-// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
-// } else {
-// detlDtos.add(detlDto);
-// }
-// });
-//
-//
-// for (DetlDto detlDto : detlDtos) {
-// Mat mat = matService.selectByMatnr(detlDto.getMatnr());
-// if (Cools.isEmpty(mat)) {
-// throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
-// }
-// WaitPakin waitPakin = new WaitPakin();
-// waitPakin.sync(mat);
-// waitPakin.setBatch(detlDto.getBatch());
-// waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
-// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
-// waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
-// waitPakin.setStatus("Y"); // 鐘舵��
-// waitPakin.setAppeUser(userId);
-// waitPakin.setAppeTime(now);
-// waitPakin.setModiUser(userId);
-// waitPakin.setModiTime(now);
-// if (!waitPakinService.insert(waitPakin)) {
-// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
-// }
-// }
-// // 鍏宠仈缁勬墭
-// } else {
+ if (Cools.isEmpty(param.getOrderNo())) {
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", param.getOrderNo()));
- if (Cools.isEmpty(order) || order.getSettle() > 2) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
+ 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;
+ one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ } else {
+ detlDtos.add(detlDto);
+ }
+ });
- // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- //OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),elem.getAnfme() );
- OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
- if (elem.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ 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"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
}
- // 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(orderDetl, elem.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
- }
+ // 鍏宠仈缁勬墭
+ } else {
- Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setBatch(orderDetl.getBatch()); // 搴忓垪鐮�
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(orderDetl.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", param.getOrderNo()));
+ if (Cools.isEmpty(order) || order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
- waitPakin.setBatch(orderDetl.getBatch());
- waitPakin.setSPgNO(orderDetl.getSPgNO());
- waitPakin.setOutOrderNo(orderDetl.getOutOrderNo());
- waitPakin.setProType(orderDetl.getProType());
- waitPakin.setLuHao(orderDetl.getLuHao());
- waitPakin.setPacking(orderDetl.getPacking());
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- });
+ // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+ //OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),elem.getAnfme() );
+ OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
+ if (elem.getAnfme() > orderDetl.getEnableQty()) {
+ throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ }
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(orderDetl, elem.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
- orderService.updateSettle(order.getId(), 2L, userId);
- // }
+ Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setBatch(orderDetl.getBatch()); // 搴忓垪鐮�
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(elem.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+
+ waitPakin.setBatch(orderDetl.getBatch());
+ waitPakin.setSPgNO(orderDetl.getSPgNO());
+ waitPakin.setOutOrderNo(orderDetl.getOutOrderNo());
+ waitPakin.setProType(orderDetl.getProType());
+ waitPakin.setLuHao(orderDetl.getLuHao());
+ waitPakin.setPacking(orderDetl.getPacking());
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ });
+
+ orderService.updateSettle(order.getId(), 2L, userId);
+ }
}
--
Gitblit v1.9.1