From 06b6bb92988ff3723cd112a51b797be0af878dfb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 04 九月 2024 18:08:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index eb2e779..c748620 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -177,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()));
@@ -529,7 +542,7 @@
}
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
- Integer staNo = liftNo * 100 + locMast1.getLev1();
+ Integer staNo = liftNo * 100 + locMast.getLev1();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54
@@ -576,9 +589,8 @@
@PostMapping("/start")
@ResponseBody
@Transactional
- @Synchronized
- public R start(@RequestBody ReplenishmentParam param){
- log.info("start param: " + param.toString());
+ 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("鏂欑鐮佷负绌�");
@@ -613,7 +625,7 @@
}
//鍏ュ簱浠诲姟
- if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+ if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode)) && Cools.isEmpty(agvWrkMast)){
//缁戝畾绔欑偣
agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
//鐢熸垚宸ヤ綔妗�
@@ -727,6 +739,17 @@
}
}
};
+ 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);
--
Gitblit v1.9.1