From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/common/web/WcsController.java | 193 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 147 insertions(+), 46 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..c748620 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -9,18 +9,19 @@
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;
import com.zy.common.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -65,6 +66,10 @@
private WrkMastMapper wrkMastMapper;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
// @Autowired
// private ErpService erpService;
@@ -172,10 +177,23 @@
return R.parse(CodeRes.NO_COMB_700);
}
+ boolean checkTimeout = false;
for (WaitPakin waitPakin : waitPakins) {
Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
mat.setWeight(waitPakin.getAnfme());
mats.add(mat);
+
+ Date appeTime = waitPakin.getAppeTime();
+ Date now = new Date();
+ long diffTime = now.getTime() - appeTime.getTime();
+ if (diffTime >= 1000 * 60 * 60 * 4) {
+ checkTimeout = true;
+ break;
+ }
+ }
+
+ if (checkTimeout) {
+ return R.error("鎵樼洏缁勬墭瓒呮椂锛屽垹闄ゅ悗閲嶆柊缁勬墭");
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
@@ -490,21 +508,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());
@@ -524,7 +542,7 @@
}
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
- Integer staNo = liftNo * 100 + locMast1.getLev1();
+ Integer staNo = liftNo * 100 + locMast.getLev1();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54
@@ -570,8 +588,9 @@
*/
@PostMapping("/start")
@ResponseBody
- public R start(@RequestBody ReplenishmentParam param){
-
+ @Transactional
+ public synchronized R start(@RequestBody ReplenishmentParam param){
+ log.info("agv start param: " + param.toString());
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
throw new CoolException("鏂欑鐮佷负绌�");
@@ -592,25 +611,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))){
+ if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode)) && Cools.isEmpty(agvWrkMast)){
+ //缁戝畾绔欑偣
+ 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();
}
@@ -622,32 +643,47 @@
@ResponseBody
public R move(@RequestBody ReplenishmentParam param){
+ log.info("current containerCode: " + param.toString());
+
if(Cools.isEmpty(currentContainerMap)){
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());
+// }
}
}
@@ -663,21 +699,86 @@
@ResponseBody
public R containerMove(@RequestBody ReplenishmentParam param){
- String devNo = param.getDevNo();
- String containerCode = currentContainerMap.get(devNo);
+ String devNo = Cools.eq("CS-310",param.getDevNo()) ? "310-1" : Cools.eq("CS-311",param.getDevNo()) ? "312-2" : Cools.eq("CS-312",param.getDevNo()) ? "314-1" : Cools.eq("CS-313",param.getDevNo()) ? "316-1" : null;
+
+ if(Cools.isEmpty(devNo)){
+ return R.error("绔欑偣鏈夎");
+ }
+
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+ String containerCode = agvBasDevp.getBarcode();
+
+// 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());
+ }
+ }
+ };
+ if (agvWrkMast.getIoType() == 103){
+ List<AgvLocDetl> suppCodes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", agvWrkMast.getBarcode()));
+ if (!Cools.isEmpty(suppCodes)){
+ for (AgvLocDetl agvLocDetl : suppCodes){
+ AgvWrkDetl agvWrkDetl = new AgvWrkDetl(agvLocDetl.getSuppCode(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getSpecs(), agvLocDetl.getAnfme());
+ agvWrkDetlList.add(agvWrkDetl);
+ }
+
+ }
+ }
+
+
+ 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