From 71d838e032d13a46a07917f5606862496220ea74 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 一月 2024 08:35:35 +0800
Subject: [PATCH] # 入库拣货功能添加
---
src/main/java/com/zy/asrs/controller/OutController.java | 88 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 1134cc2..02b14bc 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -11,13 +11,15 @@
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -45,6 +47,10 @@
private ManPakOutService manPakOutService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private PlaService plaService;
+ @Autowired
+ private PlaQtyService plaQtyService;
@PostMapping("/out/pakout/orderDetlIds/auth")
@@ -68,30 +74,38 @@
}
}
+ List<PlaQty> plaQties = new ArrayList<>();
+
+ for (OrderDetl orderDetl : orderDetls) {
+ plaService.queryStock(orderDetl,plaQties);
+ }
+
+ return R.ok(plaQties);
+
+/*
Set<String> exist = new HashSet<>();
for (OrderDetl orderDetl : orderDetls) {
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);
+
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
- for (LocDetl locDetl : locDetls) {
+ List<ManLocDetl> manLocDetls = manLocDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch());
+ for (ManLocDetl locDetl : manLocDetls) {
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(),
- sign ? locDetl.getAnfme() : issued,locDetl.getOwner(),locDetl.getPayment());
+ LocDto locDto = new LocDto(locDetl.getHostId(),locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ sign ? locDetl.getAnfme() : issued,"骞冲簱");
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鍏ㄦ澘鍑哄簱
// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101);
locDto.setStaNos(staNos);
- locDto.setManu(locDetl.getManu());
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
BigDecimal iss=new BigDecimal(Double.toString(issued)).setScale(2,BigDecimal.ROUND_HALF_UP);
@@ -103,18 +117,19 @@
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getOwner(),1);
+ LocDto locDto = new LocDto(null,null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,"骞冲簱");
// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
}
- return R.ok().add(locDtos);
+ return R.ok().add(locDtos); */
}
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+
int[][] is=new int[locDtos.size()][2];
for (int i=0;i<locDtos.size();i++){
LocDto locDto=locDtos.get(locDtos.size()-1-i);
@@ -169,15 +184,36 @@
@PostMapping("/out/pakout2/auth")
@ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
- public synchronized R pakout2(@RequestBody List<LocDto> locDtos) throws InterruptedException {
- int[][] is = new int[locDtos.size()][2];
+ @Transactional
+ public synchronized R pakout2(@RequestBody List<PlaQty> plaQties) throws InterruptedException {
+
+ for (PlaQty plaQty : plaQties){
+ if(Cools.isEmpty(plaQty.getLocNo())){
+ continue;
+ }
+ //鎻掑叆涓�鏉la鐨勬嫞璐т俊鎭�
+ plaQtyService.insert(plaQty);
+ addPakOUT(plaQty);
+
+ Pla pla = plaService.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo());
+ //pla鏄庣粏涓慨鏀归攣瀹氬嚭搴撶殑閲嶉噺
+ pla.setQtyAnfme(pla.getQtyAnfme() + plaQty.getQtyAnfme());
+ plaService.updateById(pla);
+
+ OrderDetl orderDetl = orderDetlService.selectById(plaQty.getOrderDetlId());
+ orderDetl.setWorkQty(orderDetl.getWorkQty() + plaQty.getQtyAnfme());
+ orderDetlService.updateById(orderDetl);
+ orderService.updateSettle(plaQty.getOrderId(),2L,null);
+ }
+
+ return R.ok();
+
+ /* 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) {
is[i][0] = 1;
- } else if (locDto.getManu().equals("绔嬪簱")){
- is[i][0] = 2;
} else {
is[i][0] = 0;
}
@@ -264,11 +300,31 @@
addPakOUT(locDto,uuid).equals(R.ok());
}
}
+ return R.ok(); */
+ }
+
+ private R addPakOUT(PlaQty plaQty){
+ ManPakOut manPakOut=new ManPakOut();
+ manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+System.currentTimeMillis());
+ manPakOut.setWrkSts((long)1);
+ manPakOut.setAnfme(plaQty.getQtyAnfme());
+ manPakOut.setLocNo(plaQty.getLocNo());
+ manPakOut.setBatch(plaQty.getBatch());
+ manPakOut.setBarcode(plaQty.getPackageNo());
+ manPakOut.setUuid(String.valueOf(System.currentTimeMillis()));
+ manPakOut.setCreateTime(new Date());
+ manPakOut.setUpdateTime(new Date());
+ manPakOut.setCount(0.0);
+ manPakOut.setDocNum(plaQty.getOrderNo());
+ manPakOut.setNodeId(plaQty.getOrderDetlId());
+ manPakOut.setStatus(0);
+ manPakOutService.insert(manPakOut);
return R.ok();
}
private R addPakOUT(LocDto locDto,String uuid){
ManPakOut manPakOut=new ManPakOut();
+ manPakOut.setDocId(locDto.getHostId());
manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
manPakOut.setWrkSts((long)1);
manPakOut.setAnfme(locDto.getAnfme());
@@ -281,8 +337,6 @@
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