From 9e2eb64f6f9cf3f0921818e773f52e8e41b1ad88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期四, 02 四月 2026 15:42:54 +0800
Subject: [PATCH] 实现多订单组托，并且在pda上区分配盘和来料入库单
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 192 ++++++++++++++++++++++--------------------------
src/main/java/com/zy/asrs/controller/MobileController.java | 12 ++
3 files changed, 101 insertions(+), 106 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7085b61..8c34cf5 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -648,8 +648,16 @@
}
@RequestMapping("/orderIn")
- public synchronized R AGVOrderInReturn() {
- List<OrderPakin> settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2));
+ public synchronized R AGVOrderInReturn(@RequestBody JSONObject param) {
+ List<OrderPakin> settle;
+ if(param.getString("type").equals("1")){
+ settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",1));
+ }else if(param.getString("type").equals("2")){
+ settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",2));
+ }
+ else {
+ settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2));
+ }
List<String> list = new ArrayList<>();
for (OrderPakin orderPakin : settle) {
if (orderPakin.getSettle()==2){
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index b873c5f..ab5c8d9 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -13,6 +13,9 @@
// 鍗曟嵁缂栧彿
private String orderNo;
+ // 鍗曟嵁缂栧彿
+ private List<String> orderNos;
+
// 鎵樼洏鏉＄爜
private String barcode;
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 93ae542..db16ffd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -596,7 +596,7 @@
Date now = new Date();
// 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param.getOrderNos())) {
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
@@ -645,117 +645,99 @@
}
// 鍏宠仈缁勬墭
} else {
-// Order order = orderService.selectByNo(param.getOrderNo());
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, elem.getOrderNo());
+ // 1. 鍏堟寜璁㈠崟鍒嗙粍
+ Map<String, List<CombParam.CombMat>> orderGoodsMap = new HashMap<>();
+ for (CombParam.CombMat elem : param.getCombMats()) {
+ String orderNo = elem.getOrderNo();
+ orderGoodsMap.computeIfAbsent(orderNo, k -> new ArrayList<>()).add(elem);
+ }
+
+ // 2. 楠岃瘉鎵�鏈夎鍗�
+ for (String orderNo : param.getOrderNos()) {
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
if (Cools.isEmpty(order) || order.getSettle() > 2) {
- throw new CoolException("璁㈠崟鍙蜂笉瀛樺湪鎴栬�呭凡鎵ц瀹屾垚");
- }
- // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
-// elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
- OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
- .eq("order_id", order.getId())
- .eq("matnr", elem.getMatnr()));
-
- if (Objects.isNull(detls)) {
- throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗕笉瀛樺湪锛侊紒");
- }
-
- if (elem.getAnfme() > detls.getEnableQty()) {
- throw new CoolException(detls.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
- }
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
- detlDto.setOrderId(order.getId());
- detlDto.setOrderNo(order.getOrderNo());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.findDto(detlDtos, detlDto);
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
-
-// BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
-// if (Objects.isNull(container)) {
-// throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
-// }
-// if (container.getMixMax() < detlDtos.size()) {
-// throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() + "!!");
-// }
-// Set<String> matnrs = detlDtos.stream().map(DetlDto::getMatnr).collect(Collectors.toSet());
-// List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));
-// Set<Long> tagIds = mats.stream().map(Mat::getTagId).collect(Collectors.toSet());
-// if (tagIds.size() > 1) {
-// throw new CoolException("缁勬墭鐗╂枡绫诲瀷涓嶄竴鑷达紝鍙湁鐩稿悓鐨勭墿鏂欏垎绫绘墠鍙互缁勬墭锛侊紒");
-// }
- //杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
-// Integer suplus = container.getMixMax();
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- //鏈�澶氬彲鏀炬暟閲�
-// Double singleMax = mat.getUpQty() * suplus;
-// if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
-// throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟缁勬墭涓婇檺涓猴細" + mat.getUpQty() + ",褰撳墠鎬婚噺瓒呭嚭鎵樼洏瑁呰浇涓婇檺!!");
-// }
-// BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
-// //褰撳墠鐗╂枡闇�瑕佸崰鐢ㄦ枡绠辨牸鏁�
-// Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
-// suplus = suplus - curr;
-// if (suplus < 0) {
-// throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
-// }
- OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
- .eq("order_no", param.getOrderNo())
- .eq("matnr", detlDto.getMatnr()));
-
- WaitPakin waitPakin = new WaitPakin();
- BeanUtils.copyProperties(mat, waitPakin);
-// waitPakin.sync(mat);
- waitPakin.setOrderNo(detlDto.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setOrderId(detlDto.getOrderId());
- 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 (!detlDto.getStandby1().isEmpty() && detlDto.getStandby1() != null && !detlDto.getStandby1().equals("")){
- waitPakin.setStandby1(detls.getStandby1());//閰嶇洏鍙�
- }
-
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ throw new CoolException("璁㈠崟鍙蜂笉瀛樺湪鎴栬�呭凡鎵ц瀹屾垚锛�" + orderNo);
}
}
-// Date date1 = now;
-// CanFin canFin = new CanFin();
-// canFin.setApplyTime(date1);
-// canFin.setAgvType("agv-in");
-// canFinMapper.insert(canFin);
+ // 3. 鎸夎鍗曞垎鍒鐞嗗晢鍝�
+ for (Map.Entry<String, List<CombParam.CombMat>> entry : orderGoodsMap.entrySet()) {
+ String orderNo = entry.getKey();
+ List<CombParam.CombMat> goodsList = entry.getValue();
- Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo).collect(Collectors.toSet());
- stringSet.forEach(orderNo -> {
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
+
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ for (CombParam.CombMat elem : goodsList) {
+ OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
+ .eq("order_id", order.getId())
+ .eq("matnr", elem.getMatnr()));
+
+ if (Objects.isNull(detls)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗕笉瀛樺湪锛侊紒");
+ }
+
+ if (elem.getAnfme() > detls.getEnableQty()) {
+ throw new CoolException(detls.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ }
+
+ OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(),
+ elem.getMatnr(), elem.getBatch(), elem.getBrand(),
+ elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(),
+ elem.getAnfme());
+
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),
+ elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(),
+ elem.getAnfme());
+ detlDto.setOrderId(order.getId());
+ detlDto.setOrderNo(order.getOrderNo());
+
+ if (DetlDto.has(detlDtos, detlDto)) {
+ DetlDto one = DetlDto.findDto(detlDtos, detlDto);
+ 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();
+ BeanUtils.copyProperties(mat, waitPakin);
+ waitPakin.setOrderNo(detlDto.getOrderNo());
+ waitPakin.setOrderId(detlDto.getOrderId());
+ 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("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ }
+
+ // 4. 鏇存柊鎵�鏈夎鍗曠姸鎬�
+ for (String orderNo : param.getOrderNos()) {
Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
- });
+ }
+
if(!Cools.isEmpty(param.getRsta()) && param.getRsta().contains("-")){
- //鐢熸垚AGV鎼繍浠诲姟
- //鐢熸垚AGV鎼繍鍑哄簱浠诲姟
- // 淇濆瓨宸ヤ綔妗�
Task task = new Task();
Date date = new Date();
String s = "";
@@ -791,6 +773,8 @@
}
}
+
+
}
}
--
Gitblit v1.9.1