From 52a0d2d78b0c565d05b6bccd3a5519636438dd23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 05 四月 2021 17:02:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 88cc293..df9bbd4 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -50,17 +50,33 @@
boolean error = false;
for (OpenApiStockOutParam param : params) {
Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
+ double lack = 0.0D;
if (sumAnfme < param.getAnfme()) {
+ lack = param.getAnfme() - sumAnfme;
if (!error) {
error = true;
}
MatCode mat = matCodeService.selectById(param.getMatnr());
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(param.getMatnr() + (mat==null?"": "锛�" + mat.getMatName() + "锛�"));
+ tab.setMatnr(param.getMatnr());
+ tab.setMaktx((mat==null?"": "锛�" + mat.getMatName() + "锛�"));
+ tab.setAnfme(param.getTotal());
+ tab.setLocNo("缂鸿揣");
+ tab.setTotal(lack);
+ tab.setReduce(lack);
+ tab.setRemQty(0.0D);
+ tab.setPrior(false);
+ tab.setPrior$("脳");
+ tab.setType(0);
+ result.add(tab);
+
errorMsg.append(mat == null ? param.getMatnr() : mat.getMatName()).append("搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細").append(param.getAnfme() - sumAnfme).append("</br>");
- continue;
+// continue;
}
List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
- double issued = Optional.ofNullable(param.getAnfme()).orElse(0.0D) ;
- double anfme = issued;
+ double issued = Optional.of(param.getAnfme() - lack).orElse(0.0D) ;
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
// 瑙嗗浘瀵硅薄
@@ -85,10 +101,10 @@
}
}
- if (error) {
- return R.error(errorMsg.toString());
- }
- return R.ok().add(result);
+// if (error) {
+// return R.error(errorMsg.toString());
+// }
+ return R.ok(errorMsg).add(result);
}
@PostMapping("/stockOut")
@@ -102,13 +118,21 @@
throw new CoolException("褰撳墠琛ヤ粨浠诲姟姝ｅ湪鎵ц锛岃鑰愬績绛夊緟");
}
Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
+ double lack = 0.0D;
if (sumAnfme < param.getAnfme()) {
- throw new CoolException(param.getMatnr() + "鐗╂枡鏁伴噺涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
+ lack = param.getAnfme() - sumAnfme;
+ PakoutVo pakoutVo = new PakoutVo();
+ pakoutVo.setLocNo("缂鸿揣");
+ pakoutVo.setAnfme(lack);
+ pakoutVo.setMatnr(param.getMatnr());
+// pakoutVo.setZpallet("param.getZpallet()");
+ result.add(pakoutVo);
+
+// throw new CoolException(param.getMatnr() + "鐗╂枡鏁伴噺涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
}
List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
- double issued = Optional.ofNullable(param.getAnfme()).orElse(0.0D) ;
- double anfme = issued;
+ double issued = Optional.of(param.getAnfme()-lack).orElse(0.0D) ;
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
// 鐢熸垚鍑哄簱宸ヤ綔妗�
--
Gitblit v1.9.1