From ef1a6adb261a5c30fed6361676dcd54cbbda02e4 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期二, 20 二月 2024 22:16:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 147 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 107 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6ccd5fe..76c58fc 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -9,6 +9,7 @@
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
+import com.zy.common.model.AgvBasDevpDto;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -26,6 +27,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
/**
* Created by vincent on 2020/10/30
@@ -65,6 +68,10 @@
private WrkMastMapper wrkMastMapper;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
// @Autowired
// private ErpService erpService;
@@ -490,21 +497,21 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
- Date now = new Date();
- for (LocDetl locDetl : locDetls) {
- locDetl.setLocNo(dto.getLocNo());//淇敼鐩爣搴撲綅
- locDetl.setAppeTime(now);
- locDetl.setModiTime(now);
- if (!locDetlService.insert(locDetl)) {
- throw new CoolException("搴撳瓨鏄庣粏鏇存柊澶辫触");
- }
- }
+// Date now = new Date();
+// for (LocDetl locDetl : locDetls) {
+// locDetl.setLocNo(dto.getLocNo());//淇敼鐩爣搴撲綅
+// locDetl.setAppeTime(now);
+// locDetl.setModiTime(now);
+// if (!locDetlService.insert(locDetl)) {
+// throw new CoolException("搴撳瓨鏄庣粏鏇存柊澶辫触");
+// }
+// }
- //妫�鏌ョ洰鏍囧簱浣嶏紝搴撳瓨鏄庣粏鏄惁娣诲姞鎴愬姛
- List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
- if (checkLocDetls.isEmpty()) {
- throw new CoolException("搴撳瓨鏄庣粏杩佺Щ澶辫触");
- }
+// //妫�鏌ョ洰鏍囧簱浣嶏紝搴撳瓨鏄庣粏鏄惁娣诲姞鎴愬姛
+// List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
+// if (checkLocDetls.isEmpty()) {
+// throw new CoolException("搴撳瓨鏄庣粏杩佺Щ澶辫触");
+// }
// //娓呯┖婧愬簱浣嶆暟鎹�
LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
@@ -571,7 +578,7 @@
@PostMapping("/start")
@ResponseBody
public R start(@RequestBody ReplenishmentParam param){
-
+ log.info("start param: " + param.toString());
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
throw new CoolException("鏂欑鐮佷负绌�");
@@ -592,25 +599,27 @@
//鎷ｆ枡銆佺洏鐐瑰畬鎴愪换鍔�
if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
+ //缁戝畾绔欑偣
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+
//鐢熸垚鎷ｆ枡銆佺洏鐐瑰啀鍏ュ簱浠诲姟
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
agvWrkMast.setMk("Y");
agvWrkMast.setLocNo(agvBasDevp.getDevNo());
agvWrkMastList.add(agvWrkMast);
agvWorkService.pickIn(agvWrkMastList);
- //缁戝畾绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+
return R.ok();
}
//鍏ュ簱浠诲姟
if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+ //缁戝畾绔欑偣
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
//鐢熸垚宸ヤ綔妗�
List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
- //缁戝畾绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
return R.ok();
}
@@ -626,28 +635,41 @@
currentContainerMap = new HashMap<>();
}
+ String containerCode = param.getContainerCode().split(";")[0];
+
+ if(Cools.isEmpty(containerCode)){
+ throw new CoolException("鏂欑鐮佷负绌�");
+ }
+
+ if(!Character.isDigit(containerCode.charAt(0))){
+ containerCode = containerCode.substring(3,containerCode.length());
+ }
+
+
String devNo = param.getDevNo();
- String containerCode = param.getContainerCode();
String currentContainerCode = currentContainerMap.get(devNo);
//鍒ゆ柇瀹瑰櫒鏄惁鍙戠敓鍙樺寲
- if(!Cools.eq(containerCode,currentContainerCode)){
+ if(!Cools.isEmpty(currentContainerCode) && !Cools.eq(containerCode,currentContainerCode)){
//鏌ヨ鏃у鍣ㄧ殑宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
- if(agvWrkMast.getIoType() == 101){
- //鍙戦�佸鍣ㄧ珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
- List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
- agvWrkMastList.add(agvWrkMast);
- try {
- int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
- if(code == 0){
- //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
- agvWrkMast.setWrkSts(206L);
- agvWrkMastService.updateById(agvWrkMast);
- }
- } catch (IOException e) {
- log.error(e.getMessage());
- }
+ if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
+ //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+ agvWrkMast.setWrkSts(206L);
+ agvWrkMastService.updateById(agvWrkMast);
+// //鍙戦�佸鍣ㄧ珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
+// List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+// agvWrkMastList.add(agvWrkMast);
+// try {
+// int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
+// if(code == 0){
+// //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+// agvWrkMast.setWrkSts(206L);
+// agvWrkMastService.updateById(agvWrkMast);
+// }
+// } catch (IOException e) {
+// log.error(e.getMessage());
+// }
}
}
@@ -664,20 +686,65 @@
public R containerMove(@RequestBody ReplenishmentParam param){
String devNo = param.getDevNo();
+ if(Cools.isEmpty(currentContainerMap)){
+ currentContainerMap = new HashMap<>();
+ }
String containerCode = currentContainerMap.get(devNo);
+
+ AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
//鏌ユ壘璇ュ鍣ㄧ殑宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
if(!Cools.isEmpty(agvWrkMast)){
- return R.ok(agvWrkMast);
+ List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetlList){
+ agvWrkDetl.setVolume(agvWrkDetl.getAnfme());
+ if(agvWrkMast.getIoType() == 103){
+ //瀵绘壘鏄惁鏈夌浉鍚岀墿鏂欑殑宸ヤ綔妗ｆ槑缁嗭紝骞惰繑鍥炴暟閲忎箣鍜�
+ double anfme = getAllAnfmeInAgvWrkDetlList(agvWrkDetlList,agvWrkDetl);
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ //鐢ㄤ簬缁撲綑鏁伴噺鏄剧ず
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme() - anfme);
+ }
+ if(agvWrkMast.getIoType() == 53){
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ if(Cools.isEmpty(agvLocDetl)){
+ agvWrkDetl.setVolume(0.0);
+ }else {
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme());
+ }
+ }
+ };
+
+ agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ agvBasDevpDto.setAgvWrkMast(agvWrkMast);
}
//鏌ユ壘璇ュ鍣ㄧ殑鍏ュ簱閫氱煡妗�
- AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
- if(!Cools.isEmpty(agvWaitPakin)){
- return R.ok(agvWaitPakin);
+ List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
+ if(!Cools.isEmpty(agvWaitPakinList)){
+ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
}
- return R.error("娌℃湁璇ュ鍣ㄧ殑鍑哄簱銆佹嫞鏂欍�佸叆搴撲俊鎭瓑");
+ //System.out.println("currentContainerMap: " + currentContainerMap);
+
+
+ //System.out.println("agvBasDevpDto: " + agvBasDevpDto);
+
+ return R.ok(agvBasDevpDto);
+ }
+
+ private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {
+ double allAnfme = 0;
+ for (AgvWrkDetl wd1 : agvWrkDetlList){
+ if(Cools.eq(wd0.getMatnr(),wd1.getMatnr())
+ && Cools.eq(wd0.getBatch(),wd1.getBatch())
+ && Cools.eq(wd0.getThreeCode(),wd1.getThreeCode())
+ && Cools.eq(wd0.getDeadTime(),wd1.getDeadTime())){
+ allAnfme += wd1.getAnfme();
+ }
+ }
+ return allAnfme;
}
--
Gitblit v1.9.1