From 9bc8133ba383186f84186ab30a5b86bb391fa9eb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 25 五月 2023 08:11:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 87 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 858d7f1..a26c34f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -61,7 +61,7 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
@Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
+ private ManLocDetlService manLocDetlService;
@Autowired
private OrderService orderService;
@Autowired
@@ -1118,9 +1118,14 @@
throw new CoolException("璇锋彁鍙栨槑缁�");
}
ArrayList<String> locNos = new ArrayList<>();
+ String[][] locNos2 =new String[param.getLocDetls().size()][2];
+ int i=0;
for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){
if (!locNos.contains(locDetl.getLocNo())){
locNos.add(locDetl.getLocNo());
+ locNos2[i][0]=locDetl.getLocNo();
+ locNos2[i][1]=locDetl.getManu();
+ i++;
}
}
LocOwner locOwner = locOwnerService.selectById(param.getOwnerId());
@@ -1128,27 +1133,40 @@
String lgort = "";
String owner="";
List<DetlDto> detlDtos = new ArrayList<>();
- for (String locNo : locNos) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
- for (LocDetl locDetl:locDetls){
- if (Cools.isEmpty(lgort)) {
- lgort = locDetl.getOrigin();
+ for (String[] locNo1 : locNos2) {
+ String locNo = locNo1[0];
+ if (locNo1[1].equals("骞冲簱")){
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
+ for (ManLocDetl manLocDetl:manLocDetls){
+ if (Cools.isEmpty(owner)) {
+ owner = manLocDetl.getOwner$();
+ }
+ detlDtos.add(new DetlDto(manLocDetl.getMatnr(), manLocDetl.getBatch(), manLocDetl.getAnfme()));
+ manLocDetl.setOwner(param.getOwnerId());
+ try{
+ manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("uuid",manLocDetl.getUuid()));
+ }catch (Exception e){
+ throw new Exception("鏇存柊搴撳瓨鏄庣粏鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡");
+ }
}
- if (Cools.isEmpty(owner)) {
- owner = locDetl.getOwner$();
+ }else if (locNo1[1].equals("绔嬪簱")){
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ for (LocDetl locDetl:locDetls){
+ if (Cools.isEmpty(lgort)) {
+ lgort = locDetl.getOrigin();
+ }
+ if (Cools.isEmpty(owner)) {
+ owner = locDetl.getOwner$();
+ }
+ detlDtos.add(new DetlDto(locDetl.getMatnr(), locDetl.getBatch(), locDetl.getAnfme()));
+ locDetl.setOwner(param.getOwnerId());
+ try{
+ locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("uuid",locDetl.getUuid()));
+ }catch (Exception e){
+ throw new Exception("鏇存柊搴撳瓨鏄庣粏鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡");
+ }
}
- detlDtos.add(new DetlDto(locDetl.getMatnr(), locDetl.getBatch(), locDetl.getAnfme()));
- locDetl.setOwner(param.getOwnerId());
- try{
- locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getBatch()).eq("anfme",locDetl.getAnfme()));
- }catch (Exception e){
- throw new Exception("鏇存柊搴撳瓨鏄庣粏鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡");
- }
- }
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
- try {
- locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no",locMast.getLocNo()));
- }catch (Exception e){
+ }else {
throw new Exception("鏇存柊搴撲綅鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡");
}
}
@@ -1157,4 +1175,53 @@
}
}
+ @Override
+ @Transactional
+ public void turnOverOutPayment(EmptyPlateOutParam param, Long userId) {
+ try {
+ if (param.getLocDetls().size()<=0){
+ throw new CoolException("璇锋彁鍙栨槑缁�");
+ }
+ ArrayList<String> locNos = new ArrayList<>();
+ String[][] locNos2 =new String[param.getLocDetls().size()][2];
+ int i=0;
+ for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){
+ if (!locNos.contains(locDetl.getLocNo())){
+ locNos.add(locDetl.getLocNo());
+ locNos2[i][0]=locDetl.getLocNo();
+ locNos2[i][1]=locDetl.getManu();
+ i++;
+ }
+ }
+ for (String[] locNo1 : locNos2) {
+ String locNo = locNo1[0];
+ if (locNo1[1].equals("骞冲簱")){
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
+ for (ManLocDetl manLocDetl:manLocDetls){
+ manLocDetl.setPayment(1);
+ try{
+ manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("uuid",manLocDetl.getUuid()));
+ }catch (Exception e){
+ throw new Exception("鏇存柊搴撳瓨鏄庣粏璐х墿褰㈡�佸瓧娈典俊鎭嚭閿欎簡");
+ }
+ }
+ }else if (locNo1[1].equals("绔嬪簱")){
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ for (LocDetl locDetl:locDetls){
+ locDetl.setPayment(1);
+ try{
+ locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("uuid",locDetl.getUuid()));
+ }catch (Exception e){
+ throw new Exception("鏇存柊搴撳瓨鏄庣粏璐х墿褰㈡�佸瓧娈典俊鎭嚭閿欎簡");
+ }
+ }
+ }else {
+ throw new Exception("鏇存柊搴撲綅璐х墿褰㈡�佸瓧娈典俊鎭嚭閿欎簡");
+ }
+ }
+ }catch (Exception e){
+ throw new CoolException("璐х墿褰㈡�佽浆鎹㈠嚭閿欎簡锛�"+e);
+ }
+ }
+
}
--
Gitblit v1.9.1