From a993d80747bcbc8f937999d8493d386c7aa7f7e6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 19 五月 2023 15:09:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index a99af3c..e02785c 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -159,8 +159,10 @@
List<String> matnrs=new ArrayList<>();
for (int i = 0; i < locDtos.size(); i++) {
LocDto locDto = locDtos.get(locDtos.size() - 1 - i);
- if (locDto.getLocNo() == null || locDto.getManu().equals("绔嬪簱")) {
+ if (locDto.getLocNo() == null) {
is[i][0] = 1;
+ } else if (locDto.getManu().equals("绔嬪簱")){
+ is[i][0] = 2;
} else {
is[i][0] = 0;
}
@@ -168,12 +170,17 @@
}
List<LocDto> locDtos1=new ArrayList<>();
for (int[] i : is) {
- if (i[0] == 1) {
+ if (i[0] == 2) {
if (!matnrs.contains(locDtos.get(i[1]).getMatnr())){
matnrs.add(locDtos.get(i[1]).getMatnr());
}
locDtos1.add(locDtos.get(i[1]));
locDtos.remove(i[1]);
+ }else if (i[0]==1){
+ LocDto locDto = locDtos.get(i[1]);
+ locDto.setLocNo("搴撳瓨涓嶈冻");
+ locDtos.remove(i[1]);
+ locDtos.add(locDto);
}
}
for (String matnr:matnrs){
@@ -181,7 +188,7 @@
int b = 0;
for (int i = 0; i < locDtos1.size(); i++){
if (locDtos1.get(i).getMatnr().equals(matnr)){
- if (a.equals(0)){
+ if (a.equals(0.0)){
b=i;
}
a=a+locDtos1.get(i).getAnfme();
@@ -207,7 +214,7 @@
}
for (LocDto locDto:locDtos){
ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
- if (!(locDto.getAnfme()>manLocDetl.getAnfme())) {
+ if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>=manLocDetl.getAnfme())) {
manLocDetl.setStatus(0);
if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("uuid", manLocDetl.getUuid()))) {
if (addPakOUT(locDto).equals(R.ok())) {
@@ -232,6 +239,13 @@
return R.error("娣诲姞鎷ｈ揣鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo()+locDto.getMatnr());
}
}
+ }else if (locDto.getLocNo().equals("绔嬪簱")){
+ addPakOUT(locDto).equals(R.ok());
+ }
+ }
+ for (LocDto locDto:locDtos){
+ if (locDto.getLocNo().equals("搴撳瓨涓嶈冻")){
+ addPakOUT(locDto).equals(R.ok());
}
}
return R.ok();
@@ -246,6 +260,7 @@
manPakOut.setMatnr(locDto.getMatnr());
manPakOut.setMaktx(locDto.getMaktx());
manPakOut.setDocNum(locDto.getOrderNo());
+ manPakOut.setCount(0);
manPakOut.setStatus(0);
manPakOut.setCreateTime(new Date());
manPakOut.setBatch(locDto.getBatch());
--
Gitblit v1.9.1