From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/controller/OutController.java | 283 ++++++++++++++++++++++++++------------------------------
1 files changed, 130 insertions(+), 153 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index ac141b6..379b1a9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -5,6 +5,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.PakoutRequest;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
import com.zy.common.model.LocDetlDto;
@@ -55,7 +56,12 @@
Thread.sleep(200);
return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
}
-
+ @PostMapping("/getMesOrder/auth")
+ @ManagerAuth
+ public R getMesOrder() {
+ List<String> orderNoList = orderService.getOrderNosByDocType(25L);
+ return R.ok().add(orderNoList);
+ }
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
public R pakoutPreview(@RequestBody List<Long> ids) {
@@ -63,68 +69,74 @@
return R.parse(BaseRes.PARAM);
}
- // 璁㈠崟鏄庣粏
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
if (orderDetls.isEmpty()) {
return R.parse("璇烽�夋嫨鏁版嵁");
}
- // 鑾峰彇璁㈠崟涓昏〃
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderDetls.get(0).getOrderNo()));
+ Order order = orderService.selectOne(
+ new EntityWrapper<Order>().eq("order_no", orderDetls.get(0).getOrderNo())
+ );
if (order == null) {
return R.parse("璁㈠崟鏁版嵁涓虹┖");
}
+ // 鎸夊寘瑁呯粍鍙峰垎缁勫鐞�
+ Map<String, List<OrderDetl>> brandGroup = orderDetls.stream()
+ .collect(Collectors.groupingBy(o -> {
+ String brand = o.getBrand();
+ return brand != null ? brand : "璺ㄥ贩閬�";
+ }));
+
+
List<LocDto> locDtos = new ArrayList<>();
- Set<String> exist = new HashSet<>();
+ // 姣忎釜鍖呰缁勬煡涓�娆″簱瀛�
+ for (Map.Entry<String, List<OrderDetl>> entry : brandGroup.entrySet()) {
+ String brand = entry.getKey();
+ List<OrderDetl> brandOrderDetls = entry.getValue();
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("brand",orderDetl.getBrand()));
- if (issued > 0 && !locDetls.isEmpty()) {
- // 鏍规嵁鍗曟嵁绫诲瀷杩斿洖鍑哄簱鍙ｅ垪琛� 21鍑哄簱鍙ｏ紝22鐩樼偣鍙ｏ紝23鍙嶄慨鍝佸嚭搴撳彛
- List<Integer> staNos = new ArrayList<>();
- if (order.getDocType() == 21) {
- staNos.add(3077);
- staNos.add(3106);
- } else if(order.getDocType() == 22) {
- staNos.add(3041);
- } else if(order.getDocType() == 23) {
- staNos.add(3092);
- staNos.add(3102);
- staNos.add(3095);
- }
- LocDto locDto = new LocDto();
- locDto.setLocNo(locDetls.get(0).getLocNo());
-// wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸
-// wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸
-// locDto.setBatch(locDetl.getBatch()); // 绠卞彿
-// locDto.setModel(locDetl.getModel()); // 鍗峰彿
- locDto.setBrand(orderDetl.getBrand()); // 鍖呰缁勫彿
-// locDto.setOrigin(locDetl.getOrigin()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
-// locDto.setWeight(locDetl.getWeight()); // 鍑�閲�
-// locDto.setVolume(locDetl.getVolume()); // 姣涢噸
-// locDto.setPrice(locDetl.getPrice());
-// locDto.setSpecs(locDetl.getSpecs());
-// locDto.setZpallet(locDetl.getZpallet());
- locDto.setOrderNo(orderDetl.getOrderNo());
- locDto.setStaNos(staNos);
- locDto.setOrderDetlId(orderDetl.getId());
- locDtos.add(locDto);
-// exist.add(locDetl.getLocNo());
-// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-// issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
-// if (issued > 0) {
-// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
-// locDto.setLack(Boolean.TRUE);
-// locDtos.add(locDto);
-// }
+ // 鏌ヨ繖涓寘瑁呯粍瀵瑰簲鐨勬墍鏈夊簱瀛�
+ List<LocDetl> locDetls = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("brand", brand)
+ );
+ if (locDetls.isEmpty()) continue;
+
+ // 鑾峰彇鍑哄簱鍙�
+ List<Integer> staNos = new ArrayList<>();
+ if (order.getDocType() == 21) {
+ staNos.add(3077); staNos.add(3106);
+ } else if (order.getDocType() == 22) {
+ staNos.add(2041);
+ } else if (order.getDocType() == 23) {
+ staNos.add(3092); staNos.add(3102); staNos.add(3095);
+ }
+
+ // 鍘婚噸 key锛岄伩鍏嶇浉鍚� loc+unit+model 閲嶅鏄剧ず
+ Set<String> seen = new HashSet<>();
+
+ for (LocDetl locDetl : locDetls) {
+ String key = locDetl.getLocNo() + "|" + locDetl.getUnit() + "|" + locDetl.getModel();
+ if (seen.contains(key)) continue;
+ seen.add(key);
+
+ // 瀵瑰簲澶氫釜鏄庣粏鏃讹紝鍒嗛厤鍒扮涓�涓槑缁嗭紙鎴栦綘鍙互鎷嗗垎澶氫釜锛�
+ OrderDetl firstDetl = brandOrderDetls.get(0);
+
+ LocDto locDto = new LocDto();
+ locDto.setLocNo(locDetl.getLocNo());
+ locDto.setUnit(locDetl.getUnit());
+ locDto.setModel(locDetl.getModel());
+ locDto.setThreeCode(locDetl.getThreeCode());
+ locDto.setBrand(brand);
+ locDto.setOrderNo(firstDetl.getOrderNo());
+ locDto.setStaNos(staNos);
+ locDto.setOrderDetlId(firstDetl.getId());
+
+ locDtos.add(locDto);
+ }
}
+
return R.ok().add(locDtos);
}
@@ -153,45 +165,13 @@
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
- public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
-// StockOutParam param = new StockOutParam();
-// ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
-// for (LocDto locDto:locDtos){
-// StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
-// locDetl.setBrand(locDto.getBrand());
-// locDetl.setLocNo(locDto.getLocNo());
-// locDetl.setAnfme(locDto.getAnfme());
-// locDetl.setMatnr(locDto.getMatnr());
-// locDetl.setBatch(locDto.getBatch());
-// locDetl.setModel(locDto.getModel());
-// locDetl.setSpecs(locDto.getSpecs());
-// locDetl.setZpallet(locDto.getZpallet());
-//
-// param.setOrderNo(locDto.getOrderNo());
-//
-// locDetls.add(locDetl);
-// }
-// param.setLocDetls(locDetls);
-//
-// List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
-// for (StockOutParam stockOutParam : stockOutParams){
-// workService.startupFullTakeStore(stockOutParam, getUserId());
-// }
-//
-// for (LocDto locDto:locDtos){
-// OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId());
-// orderDetl.setWorkQty(locDto.getAnfme());
-// orderDetlService.updateById(orderDetl);
-// }
-//
-// Order order = orderService.selectByNo(param.getOrderNo());
-// order.setSettle(2L);
-// orderService.updateById(order);
-
-
+ public synchronized R pakout(@RequestBody PakoutRequest request) throws InterruptedException {
+ List<LocDto> locDtos = request.getTableCache();
+ String optionValue = request.getOptionValue();
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
+
boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
@@ -206,93 +186,90 @@
Thread.sleep(1000L);
List<StockOutParam> stockOutParams = new ArrayList<>();
+ Map<Integer, StockOutParam> staNoMap = new HashMap<>();
+ Set<String> processedKeys = new HashSet<>(); // 闃叉閲嶅娣诲姞 brand+staNo
+
for (LocDto locDto : locDtos) {
- boolean flag1 = true;
- for(StockOutParam stockOutParam: stockOutParams) {
- if(stockOutParam.getOutSite().equals(locDto.getStaNo())) { // 鏈変竴鏍风殑鍑哄簱鍙�
- List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
- List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("brand", locDto.getBrand()));
- for(LocDetl locDetl:locDetls1) {
- StockOutParam.LocDetl locDetl1 = new StockOutParam.LocDetl();
- locDetl1.setLocNo(locDetl.getLocNo());
- locDetl1.setBrand(locDetl.getBrand());
- locDetl1.setModel(locDetl.getModel());
- locDetl1.setCount(locDetl.getAnfme());
- locDetls.add(locDetl1);
- }
- stockOutParam.getLocDetls().addAll(locDetls);
- flag1 = false;
- break;
- }
- }
- if(flag1) { // 娌℃湁涓�鏍风殑鍑哄簱鍙�
- StockOutParam stockOutParam = new StockOutParam();
- stockOutParam.setOutSite(locDto.getStaNo());
+ Integer staNo = locDto.getStaNo();
+ String brand = locDto.getBrand();
+ String key = staNo + "_" + brand;
+
+ // 鑾峰彇鎴栧垱寤� StockOutParam锛堟寜鍑哄簱鍙ｅ悎骞讹級
+ StockOutParam stockOutParam = staNoMap.get(staNo);
+ if (stockOutParam == null) {
+ stockOutParam = new StockOutParam();
+ stockOutParam.setOutSite(staNo);
stockOutParam.setOrderNo(locDto.getOrderNo());
- List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
- List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("brand", locDto.getBrand()));
- for(LocDetl locDetl:locDetls1) {
- StockOutParam.LocDetl locDetl1 = new StockOutParam.LocDetl();
- locDetl1.setLocNo(locDetl.getLocNo());
- locDetl1.setBrand(locDetl.getBrand());
- locDetl1.setModel(locDetl.getModel());
- locDetl1.setCount(locDetl.getAnfme());
- locDetls.add(locDetl1);
- }
- stockOutParam.setLocDetls(locDetls);
+ stockOutParam.setLocDetls(new ArrayList<>());
stockOutParams.add(stockOutParam);
+ staNoMap.put(staNo, stockOutParam);
+ }
+
+ // 閬垮厤閲嶅娣诲姞鐩稿悓brand鐨勬暟鎹�
+ if (processedKeys.contains(key)) continue;
+ processedKeys.add(key);
+
+ List<LocDetl> locDetls1 = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("brand", brand));
+ for (LocDetl locDetl : locDetls1) {
+ StockOutParam.LocDetl detl = new StockOutParam.LocDetl();
+ detl.setLocNo(locDetl.getLocNo());
+ detl.setBrand(locDetl.getBrand());
+ detl.setModel(locDetl.getModel());
+ detl.setCount(locDetl.getAnfme());
+ stockOutParam.getLocDetls().add(detl);
}
}
- for(StockOutParam stockOutParam :stockOutParams) {
+ // 鎵ц鍑哄簱閫昏緫
+ for (StockOutParam stockOutParam : stockOutParams) {
BasDevp staNo = basDevpService.checkSiteStatus(stockOutParam.getOutSite());
- // 鑾峰彇搴撲綅鏄庣粏
+
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : stockOutParam.getLocDetls()) {
- LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
- .eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
- if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
- }
- if (!locDetlDtos.isEmpty()) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
- // 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鍑哄簱绫诲瀷
- Order order = orderService.selectByNo(stockOutParam.getOrderNo());
+ LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("loc_no", paramLocDetl.getLocNo())
+ .eq("brand", paramLocDetl.getBrand())
+ .eq("model", paramLocDetl.getModel()));
- // 鍚姩鍑哄簱寮�濮�
- workService.stockOut(staNo, locDetlDtos, order.getDocType() == 22 ? IoWorkType.CHECK_OUT : null, getUserId());
- }else {
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ if (one != null) {
+ // 鍒ゆ柇鏄惁涓虹洏鐐瑰崟锛坉ocType == 23锛夛紝濡傛灉涓嶆槸鍒欐牎楠屽悎鏍兼��
+ Order order = orderService.selectByNo(stockOutParam.getOrderNo());
+ if ( order.getDocType() != 23) {
+ if (!"鍚堟牸".equals(one.getThreeCode())) {
+ throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸: " + one.getThreeCode());
+ }
+ }
+
+ locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
+ }
+
+ }
+
+ if (!locDetlDtos.isEmpty()) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
+ if ("F".equals(locMast.getLocSts()) || "D".equals(locMast.getLocSts())) {
+ Order order = orderService.selectByNo(stockOutParam.getOrderNo());
+ workService.stockOut(staNo, locDetlDtos,
+ order.getDocType() != null && order.getDocType() == 23
+ ? IoWorkType.CHECK_OUT : null,
+ getUserId(),optionValue);
+ } else {
+ throw new CoolException("鎵�閫夊簱浣嶇姸鎬佷笉涓篎/D锛屽簱浣嶅彿锛�" +
+ locMast.getLocNo() + "锛屽綋鍓嶇姸鎬侊細" +
+ locMast.getLocSts() + "-" + locMast.getLocSts$());
}
} else {
throw new CoolException("搴撳瓨涓嶅瓨鍦�");
}
}
-// List<TaskDto> taskDtos = new ArrayList<>();
-// // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
-// for (LocDto locDto : locDtos) {
-// if (locDto.isLack()) { continue; }
-// TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
-// if (TaskDto.has(taskDtos, taskDto)) {
-// TaskDto dto = TaskDto.find(taskDtos, taskDto);
-// assert dto != null;
-// dto.getLocDtos().addAll(taskDto.getLocDtos());
-// } else {
-// taskDtos.add(taskDto);
-// }
-// }
- // -----------------------------------------------------------------------------------------------
-// for (TaskDto taskDto : taskDtos) {
-// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
-// workService.stockOut(staNo, taskDto, getUserId());
-// }
-//
-// stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
return R.ok();
}
+
@PostMapping("/out/refund/loc/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R refundLoc(@RequestBody List<LocDto> locDtos) throws InterruptedException {
--
Gitblit v1.9.1