From d22f020305f8be78bbd255904d3cee1b06aab875 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 12 二月 2025 09:24:29 +0800
Subject: [PATCH] #订单出库 三个库方法拆分
---
/dev/null | 0
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js | 2
src/main/webapp/static/js/order/out.js | 4
src/main/java/com/zy/asrs/controller/OutController.java | 245 +++++++++++++++++++++++++++++++++++++++++++++++-
src/main/resources/license.lic | 0
5 files changed, 240 insertions(+), 11 deletions(-)
diff --git a/license.lic b/license.lic
deleted file mode 100644
index c867ee1..0000000
--- a/license.lic
+++ /dev/null
Binary files differ
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 6d9b28f..04518f8 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -58,9 +58,11 @@
return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
}
- @PostMapping("/out/pakout/previewCustomQuantity/auth")
+
+ /** 鍥涘悜搴撹鍗曞嚭搴� **/
+ @PostMapping("/out/pakout/previewCustomQuantity/auth/sxk")
@ManagerAuth
- public R pakoutPreviewCustomQuantity(@RequestBody JSONObject jsonObject) {
+ public R pakoutPreviewCustomQuantitySXK(@RequestBody JSONObject jsonObject) {
List<Long> ids = JSON.parseObject(jsonObject.get("ids").toString(), ArrayList.class);
Double amount = JSON.parseObject(jsonObject.get("amount").toString(), Double.class);
if (Cools.isEmpty(ids)) {
@@ -148,9 +150,9 @@
return R.ok().add(locDtos);
}
- @PostMapping("/out/pakout/preview/auth")
+ @PostMapping("/out/pakout/preview/auth/sxk")
@ManagerAuth
- public R pakoutPreview(@RequestBody List<Long> ids) {
+ public R pakoutPreviewSXK(@RequestBody List<Long> ids) {
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
@@ -220,10 +222,6 @@
}
}
}
-
-
-
-
}
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
@@ -234,6 +232,237 @@
return R.ok().add(locDtos);
}
+ /** ctu璁㈠崟鍑哄簱 **/
+ @PostMapping("/out/pakout/previewCustomQuantity/auth/ctu")
+ @ManagerAuth
+ public R pakoutPreviewCustomQuantityCTU(@RequestBody JSONObject jsonObject) {
+ List<Long> ids = JSON.parseObject(jsonObject.get("ids").toString(), ArrayList.class);
+ Double amount = JSON.parseObject(jsonObject.get("amount").toString(), Double.class);
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.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 (!Cools.isEmpty(amount)) {
+ if (amount > issued) {
+ return R.error("鏁伴噺楂樹簬鍙嚭搴撴暟閲�");
+ }
+ issued = amount;
+ }
+ 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());
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ 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);
+ locDtos.add(locDto);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ 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);
+ }
+ }
+ return R.ok().add(locDtos);
+ }
+
+ @PostMapping("/out/pakout/preview/auth/ctu")
+ @ManagerAuth
+ public R pakoutPreviewCtu(@RequestBody List<Long> ids) {
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.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; }
+ List<LocDetl> locDetls = new ArrayList<>();
+ locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ 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);
+ locDtos.add(locDto);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ 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);
+ }
+ }
+ return R.ok().add(locDtos);
+ }
+
+ /** ctu璁㈠崟鍑哄簱 **/
+ @PostMapping("/out/pakout/previewCustomQuantity/auth/crn")
+ @ManagerAuth
+ public R pakoutPreviewCustomQuantityCRN(@RequestBody JSONObject jsonObject) {
+ List<Long> ids = JSON.parseObject(jsonObject.get("ids").toString(), ArrayList.class);
+ Double amount = JSON.parseObject(jsonObject.get("amount").toString(), Double.class);
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.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 (!Cools.isEmpty(amount)) {
+ if (amount > issued) {
+ return R.error("鏁伴噺楂樹簬鍙嚭搴撴暟閲�");
+ }
+ issued = amount;
+ }
+ 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());
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ 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);
+ locDtos.add(locDto);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ 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);
+ }
+ }
+ return R.ok().add(locDtos);
+ }
+
+ @PostMapping("/out/pakout/preview/auth/crn")
+ @ManagerAuth
+ public R pakoutPreviewCRN(@RequestBody List<Long> ids) {
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.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; }
+ List<LocDetl> locDetls = new ArrayList<>();
+ locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ 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);
+ locDtos.add(locDto);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ 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);
+ }
+ }
+ return R.ok().add(locDtos);
+ }
+
+
+
+
+
+
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index cc24c37..e881460 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
index 4fa4512..c90da50 100644
--- a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
+++ b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
@@ -194,7 +194,7 @@
function pakoutPreview(ids) {
let loadIndex = layer.load(2);
$.ajax({
- url: baseUrl + "/out/pakout/preview/auth",
+ url: baseUrl + "/out/pakout/preview/auth/sxk",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(ids),
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 7ca3726..dcc944e 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -164,7 +164,7 @@
function pakoutPreview(ids,amount) {
let loadIndex = layer.load(2);
$.ajax({
- url: baseUrl + "/out/pakout/preview/auth",
+ url: baseUrl + "/out/pakout/preview/auth/sxk",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(ids),
@@ -321,7 +321,7 @@
json.ids = ids
json.amount = amount
$.ajax({
- url: baseUrl + "/out/pakout/previewCustomQuantity/auth",
+ url: baseUrl + "/out/pakout/previewCustomQuantity/auth/sxk",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(json),
--
Gitblit v1.9.1