From 5fb5b6883895eed6b79a9b20a8bff748134e9cfb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 12:38:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 92 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 6d86cff..910d56b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -33,7 +34,7 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private LocMastService locMastService;
+ private PakoutService pakoutService;
@Autowired
private StaDescService staDescService;
@Autowired
@@ -61,18 +62,38 @@
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
+ for (OrderDetl o: orderDetls) {
+ if (o.getAnfme().equals(o.getWorkQty())){
+ return R.error("鍑哄簱鐨勬槑缁嗕腑鏈夊凡鍑哄簱鐗╂枡");
+ }
+ }
Set<String> exist = new HashSet<>();
for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+ BigDecimal a1 = new BigDecimal(orderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal b1 = new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ Double c1 = a1.subtract(b1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+ double issued = Optional.of( c1 ).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+ BigDecimal decimal = BigDecimal.valueOf(c1).subtract(BigDecimal.valueOf(c1).setScale(0,BigDecimal.ROUND_DOWN));
+
+ List<LocDetl> locDetls = new ArrayList<>();
+ if (decimal.doubleValue() > 0){
+ locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
+ }else {
+ locDetls = locDetlService.queryStock3(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
+ }
+
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
+ boolean sign = false;
+ if (issued > locDetl.getAnfme() || locDetl.getAnfme().equals(issued)){
+ sign=true;
+ }
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);
+ sign ? locDetl.getAnfme() : issued,locDetl.getOwner(),locDetl.getPayment());
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), sign? 101 : 103);
// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
// locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
// //閫熻吘鍙湁鍏ㄦ澘锛屾墍浠ュ彧鑳�101鍏ㄦ澘鍑哄簱
@@ -81,14 +102,16 @@
locDto.setManu(locDetl.getManu());
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
+ BigDecimal iss=new BigDecimal(Double.toString(issued)).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal an=new BigDecimal(Double.toString(locDetl.getAnfme())).setScale(2,BigDecimal.ROUND_HALF_UP);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
+ issued=iss.subtract(an).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
} else {
break;
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getOwner(),1);
// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
@@ -116,7 +139,7 @@
}
}
if (Cools.isEmpty(locDtos)) {
- return R.error("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
+ return R.ok("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
}
boolean lack = true;
for (LocDto locDto : locDtos) {
@@ -156,23 +179,53 @@
@ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
public synchronized R pakout2(@RequestBody List<LocDto> locDtos) throws InterruptedException {
int[][] is = new int[locDtos.size()][2];
+ 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;
}
is[i][1] = locDtos.size() - 1 - i;
}
+ 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){
+ Double a = 0.0;
+ int b = 0;
+ for (int i = 0; i < locDtos1.size(); i++){
+ if (locDtos1.get(i).getMatnr().equals(matnr)){
+ if (a.equals(0.0)){
+ b=i;
+ }
+ a=a+locDtos1.get(i).getAnfme();
+ }
+ }
+ LocDto locDto = locDtos1.get(b);
+ locDto.setLocNo("绔嬪簱");
+ locDto.setAnfme(a);
+ locDtos.add(locDto);
}
if (Cools.isEmpty(locDtos)) {
return R.error("骞冲簱鍙傛暟涓虹┖锛屾病鏈夌敓鎴愭嫞璐у崟");
}
+ String uuid = String.valueOf(System.currentTimeMillis());
boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
@@ -185,10 +238,10 @@
}
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())) {
+ if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr",manLocDetl.getMatnr()))) {
+ if (addPakOUT(locDto,uuid).equals(R.ok())) {
Order order = orderService.selectByNo(locDto.getOrderNo());
if (Cools.isEmpty(order)){
return R.error("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo());
@@ -210,12 +263,19 @@
return R.error("娣诲姞鎷ｈ揣鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo()+locDto.getMatnr());
}
}
+ }else if (locDto.getLocNo().equals("绔嬪簱")){
+ addPakOUT(locDto,uuid).equals(R.ok());
+ }
+ }
+ for (LocDto locDto:locDtos){
+ if (locDto.getLocNo().equals("搴撳瓨涓嶈冻")){
+ addPakOUT(locDto,uuid).equals(R.ok());
}
}
return R.ok();
}
- private R addPakOUT(LocDto locDto){
+ private R addPakOUT(LocDto locDto,String uuid){
ManPakOut manPakOut=new ManPakOut();
manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
manPakOut.setWrkSts((long)1);
@@ -224,10 +284,14 @@
manPakOut.setMatnr(locDto.getMatnr());
manPakOut.setMaktx(locDto.getMaktx());
manPakOut.setDocNum(locDto.getOrderNo());
+ manPakOut.setCount(0.0);
manPakOut.setStatus(0);
manPakOut.setCreateTime(new Date());
manPakOut.setBatch(locDto.getBatch());
manPakOut.setUpdateTime(new Date());
+ manPakOut.setPayment(locDto.getPayment());
+ manPakOut.setOwner(locDto.getOwner());
+ manPakOut.setUuid(uuid);
if (Cools.isEmpty(manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num",locDto.getOrderNo())))){
manPakOut.setName(locDto.getMaktx());
}
--
Gitblit v1.9.1