From ab41622d30946f83b34e5a5d881741237628f6f1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 14:26:39 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OutController.java | 390 +++++++++++++++++++++++--------------------------------
1 files changed, 161 insertions(+), 229 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index b9adff4..85a3884 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -11,14 +11,11 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Utils;
import com.zy.common.model.ExistDto;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
-import com.zy.common.utils.OutStockInterceptUtil;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -37,9 +34,9 @@
public class OutController extends BaseController {
@Autowired
- private OrderService orderService;
+ private OrderPakoutService orderPakoutService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private LocDetlService locDetlService;
@Autowired
@@ -56,7 +53,7 @@
@ManagerAuth
public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
Thread.sleep(200);
- return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
+ return R.ok().add(orderDetlPakoutService.selectByOrderId(orderId).stream().map(OrderDetlPakout::getId).distinct().collect(Collectors.toList()));
}
@PostMapping("/out/pakout/OrderOutGetLoc/auth")
@@ -66,19 +63,21 @@
return R.parse(BaseRes.PARAM);
}
// 鑾峰彇璁㈠崟鏄庣粏骞跺鐞�
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
Set<String> processedLocs = new HashSet<>(); // 宸插鐞嗚揣浣嶇紦瀛�
Set<ExistDto> processedStock = new HashSet<>(); // 宸插鐞嗗簱瀛樼紦瀛�
List<LocDto> result = new ArrayList<>();
- for (OrderDetl detl : orderDetls) {
+ for (OrderDetlPakout detl : orderDetlPakouts) {
result.addAll(processOrderDetl(detl, null, processedLocs, processedStock));
}
return R.ok().add(result);
}
- /** 澶勭悊璁㈠崟鍑哄簱璐т綅鍒嗛厤
+ /**
+ * 澶勭悊璁㈠崟鍑哄簱璐т綅鍒嗛厤
+ *
* @param jsonObject 璇锋眰鍙傛暟(鍖呭惈璁㈠崟鏄庣粏ID鍒楄〃鍜屽嚭搴撴暟閲�)
*/
@PostMapping("/out/pakout/OrderOutGetLoc.number/auth")
@@ -95,12 +94,12 @@
// 鑾峰彇璁㈠崟鏄庣粏骞跺鐞�
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
Set<String> processedLocs = new HashSet<>(); // 宸插鐞嗚揣浣嶇紦瀛�
Set<ExistDto> processedStock = new HashSet<>(); // 宸插鐞嗗簱瀛樼紦瀛�
List<LocDto> result = new ArrayList<>();
- for (OrderDetl detl : orderDetls) {
+ for (OrderDetlPakout detl : orderDetlPakouts) {
result.addAll(processOrderDetl(detl, amount, processedLocs, processedStock));
}
@@ -109,15 +108,16 @@
/**
* 澶勭悊鍗曚釜璁㈠崟鏄庣粏鐨勮揣浣嶅垎閰�
- * @param orderDetl 璁㈠崟鏄庣粏
- * @param requiredAmount 闇�姹傚嚭搴撻噺
- * @param processedLocs 宸插鐞嗙殑璐т綅闆嗗悎锛堢敤浜庡幓閲嶏級
- * @param processedStock 宸插鐞嗙殑搴撳瓨璁板綍闆嗗悎锛堢敤浜庡幓閲嶏級
+ *
+ * @param orderDetlPakout 璁㈠崟鏄庣粏
+ * @param requiredAmount 闇�姹傚嚭搴撻噺
+ * @param processedLocs 宸插鐞嗙殑璐т綅闆嗗悎锛堢敤浜庡幓閲嶏級
+ * @param processedStock 宸插鐞嗙殑搴撳瓨璁板綍闆嗗悎锛堢敤浜庡幓閲嶏級
*/
- private List<LocDto> processOrderDetl(OrderDetl orderDetl, Double requiredAmount,
- Set<String> processedLocs, Set<ExistDto> processedStock) {
+ private List<LocDto> processOrderDetl(OrderDetlPakout orderDetlPakout, Double requiredAmount,
+ Set<String> processedLocs, Set<ExistDto> processedStock) {
List<LocDto> result = new ArrayList<>();
- double remaining = Optional.ofNullable(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ double remaining = Optional.ofNullable(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
// 璋冩暣鏍￠獙閫昏緫锛氬綋requiredAmount涓嶄负null鏃舵墠鏍￠獙
if (requiredAmount != null) {
@@ -125,7 +125,7 @@
throw new CoolException("鍑哄簱鏁伴噺蹇呴』澶т簬0");
}
if (requiredAmount > remaining) {
- throw new CoolException("璁㈠崟"+orderDetl.getOrderNo()+"璇锋眰鏁伴噺瓒呰繃鍙嚭搴撴暟閲忥紝鍓╀綑鍙嚭锛�" + remaining);
+ throw new CoolException("璁㈠崟" + orderDetlPakout.getOrderNo() + "璇锋眰鏁伴噺瓒呰繃鍙嚭搴撴暟閲忥紝鍓╀綑鍙嚭锛�" + remaining);
}
// 褰撴寚瀹氭暟閲忔椂锛屼娇鐢ㄦ寚瀹氭暟閲忚鐩栧墿浣欓噺
remaining = Math.min(requiredAmount, remaining);
@@ -133,9 +133,9 @@
// 鑾峰彇鍙敤搴撳瓨璁板綍
List<LocDetl> stocks = locDetlService.queryStock(
- orderDetl.getMatnr(), orderDetl.getBatch(), null,
- processedLocs, orderDetl.getSupp(),
- orderDetl.getTemp1(), orderDetl.getTemp2()
+ orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getSuppCode(),
+ processedLocs, orderDetlPakout.getSupp(),
+ orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2()
);
// 閬嶅巻澶勭悊姣忎釜搴撳瓨璁板綍
@@ -143,15 +143,15 @@
if (remaining <= 0) break;
LocMast locMast = locMastService.selectOne(
- new EntityWrapper<LocMast>().eq("loc_no", stock.getLocNo()));
+ new EntityWrapper<LocMast>().eq("loc_no", stock.getLocNo()));
// 闈�7鍙峰爢鍨涙満澶勭悊閫昏緫
if (locMast.getCrnNo() != 7) {
- processNormalLocation(stock, orderDetl, remaining, processedStock, result);
+ processNormalLocation(stock, orderDetlPakout, remaining, processedStock, result);
}
// 7鍙峰爢鍨涙満鐗规畩澶勭悊
else {
- processCrn7Location(locMast, stock, orderDetl, remaining, processedStock, result);
+ processCrn7Location(locMast, stock, orderDetlPakout, remaining, processedStock, result);
}
remaining -= stock.getAnfme();
@@ -159,188 +159,110 @@
// 澶勭悊缂洪噺鎯呭喌
if (remaining > 0) {
- result.add(createShortageDto(orderDetl, remaining));
+ result.add(createShortageDto(orderDetlPakout, 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
+ */
+ private LocDto createShortageDto(OrderDetlPakout orderDetlPakout, double qty) {
+ LocDto dto = new LocDto(null, orderDetlPakout.getMatnr(),
+ orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(),
+ orderDetlPakout.getOrderNo(), qty);
dto.setLack(true);
return dto;
}
- /** 澶勭悊鏅�氳揣浣� */
- private void processNormalLocation(LocDetl stock, OrderDetl orderDetl, double remaining,
- Set<ExistDto> processedStock, List<LocDto> result) {
+ /**
+ * 澶勭悊鏅�氳揣浣�
+ */
+ private void processNormalLocation(LocDetl stock, OrderDetlPakout orderDetlPakout, double remaining,
+ Set<ExistDto> processedStock, List<LocDto> result) {
ExistDto exist = new ExistDto()
- .setLocNo(stock.getLocNo())
- .setMatnr(stock.getMatnr())
- .setBatch(stock.getBatch());
+ .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));
+ result.add(buildLocDto(stock, orderDetlPakout, allocateQty));
}
}
- /** 澶勭悊7鍙峰爢鍨涙満璐т綅 */
- private void processCrn7Location(LocMast baseLoc, LocDetl stock, OrderDetl orderDetl,
- double remaining, Set<ExistDto> processedStock,
- List<LocDto> result) {
+ /**
+ * 澶勭悊7鍙峰爢鍨涙満璐т綅
+ */
+ private void processCrn7Location(LocMast baseLoc, LocDetl stock, OrderDetlPakout orderDetlPakout,
+ 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));
+ .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));
+ .filter(loc -> "F".equals(loc.getLocSts()))
+ .forEach(loc -> processCrn7SubLocation(loc, stock, orderDetlPakout, remaining, processedStock, result));
}
- /** 澶勭悊7鍙峰爢鍨涙満瀛愯揣浣� */
- private void processCrn7SubLocation(LocMast loc, LocDetl stock, OrderDetl orderDetl,
- double remaining, Set<ExistDto> processedStock,
- List<LocDto> result) {
+ /**
+ * 澶勭悊7鍙峰爢鍨涙満瀛愯揣浣�
+ */
+ private void processCrn7SubLocation(LocMast loc, LocDetl stock, OrderDetlPakout orderDetlPakout,
+ 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()));
+ 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());
+ .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));
+ result.add(buildLocDto(subStock, orderDetlPakout, allocateQty));
}
}
}
- /** 鏋勫缓璐т綅DTO閫氱敤鏂规硶 */
- private LocDto buildLocDto(LocDetl stock, OrderDetl orderDetl, double qty) {
+ /**
+ * 鏋勫缓璐т綅DTO閫氱敤鏂规硶
+ */
+ private LocDto buildLocDto(LocDetl stock, OrderDetlPakout orderDetlPakout, double qty) {
LocDto dto = new LocDto(
- stock.getLocNo(), stock.getMatnr(), stock.getMaktx(),
- stock.getBatch(), orderDetl.getOrderNo(), qty
+ stock.getLocNo(), stock.getMatnr(), stock.getMaktx(),
+ stock.getBatch(), orderDetlPakout.getOrderNo(), qty
);
// 鑾峰彇宸ヤ綔绔欏苟杞崲
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(
- stock.getLocNo(), qty >= stock.getAnfme() ? 101 : 103);
+ 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());
+ .map(staNo -> new LocDto.staListDto()
+ .setStaNo(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;
-// }
-
- /** 鍥涘悜搴撹鍗曞嚭搴� **/
+ /**
+ * 鍥涘悜搴撹鍗曞嚭搴�
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/sxk")
@ManagerAuth
public R pakoutPreviewCustomQuantitySXK(@RequestBody JSONObject jsonObject) {
@@ -349,26 +271,28 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
Set<ExistDto> existDtos = new HashSet<>();
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
if (!Cools.isEmpty(amount)) {
if (amount > issued) {
return R.error("鏁伴噺楂樹簬鍙嚭搴撴暟閲�");
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockFour(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if (locMast.getLocSts().equals("F")){
+ if (locMast.getLocSts().equals("F")) {
LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("loc_No", locMast.getLocNo())
.eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
@@ -377,23 +301,22 @@
existDto.setLocNo(locDetl1.getLocNo());
existDto.setMatnr(locDetl1.getMatnr());
existDto.setBatch(locDetl1.getBatch());
- if (existDtos.add(existDto)){
+ if (existDtos.add(existDto)) {
if (issued > 0) {
- LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
+ LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetlPakout.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);
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
- }else {
+ } else {
break;
}
}
@@ -402,7 +325,7 @@
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
@@ -416,20 +339,22 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
Set<ExistDto> existDtos = new HashSet<>();
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockFour(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if (locMast.getLocSts().equals("F")){
+ if (locMast.getLocSts().equals("F")) {
LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("loc_No", locMast.getLocNo())
.eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
@@ -438,23 +363,22 @@
existDto.setLocNo(locDetl1.getLocNo());
existDto.setMatnr(locDetl1.getMatnr());
existDto.setBatch(locDetl1.getBatch());
- if (existDtos.add(existDto)){
+ if (existDtos.add(existDto)) {
if (issued > 0) {
- LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
+ LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetlPakout.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);
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
- }else {
+ } else {
break;
}
}
@@ -463,7 +387,7 @@
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
@@ -471,7 +395,9 @@
return R.ok().add(locDtos);
}
- /** ctu璁㈠崟鍑哄簱 **/
+ /**
+ * ctu璁㈠崟鍑哄簱
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/ctu")
@ManagerAuth
public R pakoutPreviewCustomQuantityCTU(@RequestBody JSONObject jsonObject) {
@@ -480,23 +406,25 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
Set<ExistDto> existDtos = new HashSet<>();
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
if (!Cools.isEmpty(amount)) {
if (amount > issued) {
return R.error("鏁伴噺楂樹簬鍙嚭搴撴暟閲�");
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockMinAnfme(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -504,14 +432,13 @@
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(),
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetlPakout.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);
@@ -519,12 +446,12 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
@@ -538,17 +465,19 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
Set<ExistDto> existDtos = new HashSet<>();
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockMinAnfme(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -556,14 +485,13 @@
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(),
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetlPakout.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);
@@ -571,12 +499,12 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
@@ -584,7 +512,9 @@
return R.ok().add(locDtos);
}
- /** crn璁㈠崟鍑哄簱 **/
+ /**
+ * crn璁㈠崟鍑哄簱
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/crn")
@ManagerAuth
public R pakoutPreviewCustomQuantityCRN(@RequestBody JSONObject jsonObject) {
@@ -593,23 +523,25 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
Set<ExistDto> existDtos = new HashSet<>();
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
if (!Cools.isEmpty(amount)) {
if (amount > issued) {
return R.error("鏁伴噺楂樹簬鍙嚭搴撴暟閲�");
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockCrn(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -617,14 +549,13 @@
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(),
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetlPakout.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);
@@ -632,12 +563,12 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
@@ -651,17 +582,19 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
Set<String> exist = new HashSet<>();
Set<ExistDto> existDtos = new HashSet<>();
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockCrn(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), null, exist, orderDetlPakout.getSupp(), orderDetlPakout.getTemp1(), orderDetlPakout.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -669,14 +602,13 @@
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(),
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetlPakout.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);
@@ -684,22 +616,18 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetlPakout.getMatnr(), orderDetlPakout.getMaktx(), orderDetlPakout.getBatch(), orderDetlPakout.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
}
return R.ok().add(locDtos);
}
-
-
-
-
@PostMapping("/out/pakout/auth")
@@ -711,7 +639,7 @@
boolean lack = true;
for (LocDto locDto : locDtos) {
// 鍒ゆ柇鍏ュ簱妯″紡
- OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
+ //OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
if (!locDto.isLack()) {
lack = false;
break;
@@ -726,7 +654,9 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
@@ -753,7 +683,7 @@
boolean lack = true;
for (LocDto locDto : locDtos) {
// 鍒ゆ柇鍏ュ簱妯″紡
- OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
+ //OutStockInterceptUtil.outStockIntercept(locDto.getStaNo());
if (!locDto.isLack()) {
lack = false;
break;
@@ -768,7 +698,9 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
--
Gitblit v1.9.1