From 928ecedcacac0e9e4df23c9c1874a4eac8b85cd6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 19 六月 2025 15:49:45 +0800
Subject: [PATCH] #批量出库同一托盘不同箱号界面显示bug修复
---
src/main/java/com/zy/asrs/controller/OpenController.java | 2
src/main/java/com/zy/asrs/entity/OutLocInfoDto.java | 14 +++
src/main/java/com/zy/asrs/controller/OutController.java | 160 +++++++++++++--------------------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 +
4 files changed, 77 insertions(+), 106 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5902ae2..77ace36 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -206,7 +206,7 @@
public synchronized R getOutLocInfoByBarcode(@RequestHeader(required = false) String appkey,
@RequestBody OutLocInfoParam param,
HttpServletRequest request) {
- auth(appkey, param, request);
+// auth(appkey, param, request);
if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode())) {
return R.parse("鎵樼洏鐮佷笉鑳戒负绌�");
}
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 51211a5..862bff4 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -130,8 +130,6 @@
return R.ok().add(locDtos);
}
-
-
@PostMapping("/out/refund/loc/preview/auth")
@ManagerAuth
public R refundLocPreview(@RequestBody List<Long> ids) {
@@ -158,44 +156,10 @@
@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);
-
-
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
+
boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
@@ -210,98 +174,84 @@
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) {
- if(!"鍚堟牸".equals(one.getThreeCode())) {
- throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸:" + one.getThreeCode() );
+ LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("loc_no", paramLocDetl.getLocNo())
+ .eq("brand", paramLocDetl.getBrand())
+ .eq("model", paramLocDetl.getModel()));
+
+ if (one != null) {
+ 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 (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
- // 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鍑哄簱绫诲瀷
- Order order = orderService.selectByNo(stockOutParam.getOrderNo());
- // 鍚姩鍑哄簱寮�濮�
- workService.stockOut(staNo, locDetlDtos, order.getDocType() == 23 ? IoWorkType.CHECK_OUT : null, getUserId());
- }else {
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ 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());
+ } 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 {
diff --git a/src/main/java/com/zy/asrs/entity/OutLocInfoDto.java b/src/main/java/com/zy/asrs/entity/OutLocInfoDto.java
index fc490c0..b97eeed 100644
--- a/src/main/java/com/zy/asrs/entity/OutLocInfoDto.java
+++ b/src/main/java/com/zy/asrs/entity/OutLocInfoDto.java
@@ -87,6 +87,20 @@
* 瑙勬牸
*/
private String specs;
+
+ private String boxType;
+
+ private String CoreType;
+
+ private String width;
+
+ private String thickness;
+
+ private Double weight;
+
+ private Double length;
+
+ private Double volume;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 7f2c52e..965d52b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2006,6 +2006,13 @@
materialDetail.setRollNo(wrkDetl.getModel());
materialDetail.setBoxNo(wrkDetl.getUnit());
materialDetail.setSpecs(wrkDetl.getMatnr());
+ materialDetail.setBoxType(wrkDetl.getColor());
+ materialDetail.setCoreType(wrkDetl.getManu());
+ materialDetail.setWidth(wrkDetl.getSku());
+ materialDetail.setThickness(wrkDetl.getItemNum());
+ materialDetail.setWeight(wrkDetl.getWeight());
+ materialDetail.setLength(wrkDetl.getLength());
+ materialDetail.setVolume(wrkDetl.getVolume());
material.setBoxPos(wrkDetl.getOrigin()); // 鎵樼洏涓婃湪绠变綅缃�
materialDetailList.add(materialDetail);
}
--
Gitblit v1.9.1