From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OutController.java | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 283 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 3a54e57..31ed7a9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -7,6 +7,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
@@ -57,6 +58,286 @@
Thread.sleep(200);
return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
}
+
+ @PostMapping("/out/pakout/OrderOutGetLoc/auth")
+ @ManagerAuth
+ public R OrderOutGetLoc(@RequestBody List<Long> ids) {
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ // 鑾峰彇璁㈠崟鏄庣粏骞跺鐞�
+ List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ Set<String> processedLocs = new HashSet<>(); // 宸插鐞嗚揣浣嶇紦瀛�
+ Set<ExistDto> processedStock = new HashSet<>(); // 宸插鐞嗗簱瀛樼紦瀛�
+ List<LocDto> result = new ArrayList<>();
+
+ for (OrderDetl detl : orderDetls) {
+ result.addAll(processOrderDetl(detl, null, processedLocs, processedStock));
+ }
+
+ return R.ok().add(result);
+ }
+
+ /** 澶勭悊璁㈠崟鍑哄簱璐т綅鍒嗛厤
+ * @param jsonObject 璇锋眰鍙傛暟(鍖呭惈璁㈠崟鏄庣粏ID鍒楄〃鍜屽嚭搴撴暟閲�)
+ */
+ @PostMapping("/out/pakout/OrderOutGetLoc.number/auth")
+ @ManagerAuth
+ public R OrderOutGetLocNumber(@RequestBody JSONObject jsonObject) {
+ // 鍙傛暟鏍￠獙
+ if (!jsonObject.containsKey("ids") || !jsonObject.containsKey("amount")) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ // 鎻愬彇骞惰浆鎹㈠弬鏁�
+ List<Long> ids = jsonObject.getJSONArray("ids").toJavaList(Long.class);
+ Double amount = jsonObject.getDouble("amount");
+
+
+ // 鑾峰彇璁㈠崟鏄庣粏骞跺鐞�
+ List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ Set<String> processedLocs = new HashSet<>(); // 宸插鐞嗚揣浣嶇紦瀛�
+ Set<ExistDto> processedStock = new HashSet<>(); // 宸插鐞嗗簱瀛樼紦瀛�
+ List<LocDto> result = new ArrayList<>();
+
+ for (OrderDetl detl : orderDetls) {
+ result.addAll(processOrderDetl(detl, amount, processedLocs, processedStock));
+ }
+
+ return R.ok().add(result);
+ }
+
+ /**
+ * 澶勭悊鍗曚釜璁㈠崟鏄庣粏鐨勮揣浣嶅垎閰�
+ * @param orderDetl 璁㈠崟鏄庣粏
+ * @param requiredAmount 闇�姹傚嚭搴撻噺
+ * @param processedLocs 宸插鐞嗙殑璐т綅闆嗗悎锛堢敤浜庡幓閲嶏級
+ * @param processedStock 宸插鐞嗙殑搴撳瓨璁板綍闆嗗悎锛堢敤浜庡幓閲嶏級
+ */
+ private List<LocDto> processOrderDetl(OrderDetl orderDetl, Double requiredAmount,
+ Set<String> processedLocs, Set<ExistDto> processedStock) {
+ List<LocDto> result = new ArrayList<>();
+ double remaining = Optional.ofNullable(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+
+ // 璋冩暣鏍￠獙閫昏緫锛氬綋requiredAmount涓嶄负null鏃舵墠鏍￠獙
+ if (requiredAmount != null) {
+ if (requiredAmount <= 0) {
+ throw new CoolException("鍑哄簱鏁伴噺蹇呴』澶т簬0");
+ }
+ if (requiredAmount > remaining) {
+ throw new CoolException("璁㈠崟"+orderDetl.getOrderNo()+"璇锋眰鏁伴噺瓒呰繃鍙嚭搴撴暟閲忥紝鍓╀綑鍙嚭锛�" + remaining);
+ }
+ // 褰撴寚瀹氭暟閲忔椂锛屼娇鐢ㄦ寚瀹氭暟閲忚鐩栧墿浣欓噺
+ remaining = Math.min(requiredAmount, remaining);
+ }
+
+ // 鑾峰彇鍙敤搴撳瓨璁板綍
+ List<LocDetl> stocks = locDetlService.queryStock(
+ orderDetl.getMatnr(), orderDetl.getBatch(), null,
+ processedLocs, orderDetl.getSupp(),
+ orderDetl.getTemp1(), orderDetl.getTemp2()
+ );
+
+ // 閬嶅巻澶勭悊姣忎釜搴撳瓨璁板綍
+ for (LocDetl stock : stocks) {
+ if (remaining <= 0) break;
+
+ LocMast locMast = locMastService.selectOne(
+ new EntityWrapper<LocMast>().eq("loc_no", stock.getLocNo()));
+
+ // 闈�7鍙峰爢鍨涙満澶勭悊閫昏緫
+ if (locMast.getCrnNo() != 7) {
+ processNormalLocation(stock, orderDetl, remaining, processedStock, result);
+ }
+ // 7鍙峰爢鍨涙満鐗规畩澶勭悊
+ else {
+ processCrn7Location(locMast, stock, orderDetl, remaining, processedStock, result);
+ }
+
+ remaining -= stock.getAnfme();
+ }
+
+ // 澶勭悊缂洪噺鎯呭喌
+ if (remaining > 0) {
+ result.add(createShortageDto(orderDetl, remaining));
+ }
+
+ return result;
+ }
+
+ /** 鍒涘缓缂洪噺DTO */
+ private LocDto createShortageDto(OrderDetl orderDetl, double qty) {
+ LocDto dto = new LocDto(null, orderDetl.getMatnr(),
+ orderDetl.getMaktx(), orderDetl.getBatch(),
+ orderDetl.getOrderNo(), qty);
+ dto.setLack(true);
+ return dto;
+ }
+
+ /** 澶勭悊鏅�氳揣浣� */
+ private void processNormalLocation(LocDetl stock, OrderDetl orderDetl, double remaining,
+ Set<ExistDto> processedStock, List<LocDto> result) {
+ ExistDto exist = new ExistDto()
+ .setLocNo(stock.getLocNo())
+ .setMatnr(stock.getMatnr())
+ .setBatch(stock.getBatch());
+
+ if (processedStock.add(exist)) {
+ double allocateQty = Math.min(remaining, stock.getAnfme());
+ result.add(buildLocDto(stock, orderDetl, allocateQty));
+ }
+ }
+
+ /** 澶勭悊7鍙峰爢鍨涙満璐т綅 */
+ private void processCrn7Location(LocMast baseLoc, LocDetl stock, OrderDetl orderDetl,
+ double remaining, Set<ExistDto> processedStock,
+ List<LocDto> result) {
+ // 鏋勫缓鏌ヨ鏉′欢
+ EntityWrapper<LocMast> wrapper = (EntityWrapper<LocMast>) new EntityWrapper<LocMast>()
+ .eq("gro1", baseLoc.getGro1())
+ .eq("crn_no", 7)
+ .eq("loc_type1", baseLoc.getLocType1())
+ .orderBy("bay1", (baseLoc.getBay1() == 6 || baseLoc.getBay1() == 5));
+
+ // 鑾峰彇鍚岀粍璐т綅骞跺鐞�
+ locMastService.selectList(wrapper).stream()
+ .filter(loc -> "F".equals(loc.getLocSts()))
+ .forEach(loc -> processCrn7SubLocation(loc, stock, orderDetl, remaining, processedStock, result));
+ }
+
+ /** 澶勭悊7鍙峰爢鍨涙満瀛愯揣浣� */
+ private void processCrn7SubLocation(LocMast loc, LocDetl stock, OrderDetl orderDetl,
+ double remaining, Set<ExistDto> processedStock,
+ List<LocDto> result) {
+ LocDetl subStock = locDetlService.selectOne(
+ new EntityWrapper<LocDetl>()
+ .eq("loc_No", loc.getLocNo())
+ .eq("matnr", stock.getMatnr())
+ .eq("batch", stock.getBatch()));
+
+ if (!Cools.isEmpty(subStock)) {
+ ExistDto exist = new ExistDto()
+ .setLocNo(subStock.getLocNo())
+ .setMatnr(subStock.getMatnr())
+ .setBatch(subStock.getBatch());
+
+ if (processedStock.add(exist) && remaining > 0) {
+ double allocateQty = Math.min(remaining, subStock.getAnfme());
+ result.add(buildLocDto(subStock, orderDetl, allocateQty));
+ }
+ }
+ }
+
+ /** 鏋勫缓璐т綅DTO閫氱敤鏂规硶 */
+ private LocDto buildLocDto(LocDetl stock, OrderDetl orderDetl, double qty) {
+ LocDto dto = new LocDto(
+ stock.getLocNo(), stock.getMatnr(), stock.getMaktx(),
+ stock.getBatch(), orderDetl.getOrderNo(), qty
+ );
+
+ // 鑾峰彇宸ヤ綔绔欏苟杞崲
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(
+ stock.getLocNo(), qty >= stock.getAnfme() ? 101 : 103);
+
+ List<LocDto.staListDto> staList = staNos.stream()
+ .map(staNo -> new LocDto.staListDto()
+ .setStaNo(staNo)
+ .setStaName(Utils.getStaName(staNo)))
+ .collect(Collectors.toList());
+
+ dto.setStaNos(staList);
+ return dto;
+ }
+
+ // 鏂板鏂规硶
+// private List<LocDto> processOrderDetl(OrderDetl orderDetl, Double amount, Set<String> exist, Set<ExistDto> existDtos) {
+// List<LocDto> result = new ArrayList<>();
+// double issued = Optional.ofNullable(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+//
+// if (amount != null && amount > issued) {
+// throw new CoolException("鏁伴噺楂樹簬鍙嚭搴撴暟閲�");
+// }
+//
+// List<LocDetl> locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
+// for (LocDetl locDetl : locDetls) {
+// if (issued <= 0) break;
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+// if (locMast.getCrnNo() != 7) {
+// ExistDto existDto = new ExistDto();
+// existDto.setLocNo(locDetl.getLocNo());
+// existDto.setMatnr(locDetl.getMatnr());
+// existDto.setBatch(locDetl.getBatch());
+// if (existDtos.add(existDto)) {
+// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+// issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+// List<LocDto.staListDto> maps = new ArrayList<>();
+// for (Integer staNo : staNos) {
+// LocDto.staListDto staListDto = new LocDto.staListDto();
+// staListDto.setStaNo(staNo);
+// staListDto.setStaName(Utils.getStaName(staNo));
+// maps.add(staListDto);
+// }
+// locDto.setStaNos(maps);
+// result.add(locDto);
+// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+// issued = issued - locDetl.getAnfme();
+// }
+// }else {
+// List<LocMast> locMasts = new ArrayList<>();
+// if (locMast.getBay1() ==6 || locMast.getBay1()==5){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("gro1", locMast.getGro1())
+// .eq("crn_no", 7)
+// .eq("loc_type1",locMast.getLocType1())
+// .orderBy("bay1", true));
+// }else{
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("gro1", locMast.getGro1())
+// .eq("crn_no", 7)
+// .eq("loc_type1",locMast.getLocType1())
+// .orderBy("bay1", false));
+// }
+// for (LocMast locMast1 : locMasts){
+// if (locMast1.getLocSts().equals("F")){
+// LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+// .eq("loc_No", locMast1.getLocNo())
+// .eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
+// if (!Cools.isEmpty(locDetl1)) {
+// ExistDto existDto = new ExistDto();
+// existDto.setLocNo(locDetl1.getLocNo());
+// existDto.setMatnr(locDetl1.getMatnr());
+// existDto.setBatch(locDetl1.getBatch());
+// if (existDtos.add(existDto)){
+// if (issued <= 0) break;
+// LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
+// issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
+// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl1.getLocNo(), issued >= locDetl1.getAnfme() ? 101 : 103);
+// List<LocDto.staListDto> maps = new ArrayList<>();
+// for (Integer staNo : staNos) {
+// LocDto.staListDto staListDto = new LocDto.staListDto();
+// staListDto.setStaNo(staNo);
+// staListDto.setStaName(Utils.getStaName(staNo));
+// maps.add(staListDto);
+// }
+// locDto.setStaNos(maps);
+// result.add(locDto);
+// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+// issued = issued - locDetl.getAnfme();
+//
+// }
+// }
+// }
+// }
+// }
+// }
+// if (issued > 0) {
+// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+// locDto.setLack(Boolean.TRUE);
+// result.add(locDto);
+// }
+// return result;
+// }
/** 鍥涘悜搴撹鍗曞嚭搴� **/
@@ -430,7 +711,7 @@
boolean lack = true;
for (LocDto locDto : locDtos) {
// 鍒ゆ柇鍏ュ簱妯″紡
- OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
+ //OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
if (!locDto.isLack()) {
lack = false;
break;
@@ -472,7 +753,7 @@
boolean lack = true;
for (LocDto locDto : locDtos) {
// 鍒ゆ柇鍏ュ簱妯″紡
- OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
+ //OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
if (!locDto.isLack()) {
lack = false;
break;
--
Gitblit v1.9.1