From 19d222a720ba3d57964b2bee19d6e433851fb990 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 05 二月 2024 14:20:03 +0800
Subject: [PATCH] 输送线改造
---
src/main/java/com/zy/common/web/WcsController.java | 47 +++++++++++++++++++++++++++++++++++------------
src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java | 2 +-
2 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
index 39ddb69..4898bff 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
@@ -21,7 +21,7 @@
@Select("select dev_no from agv_bas_devp where loc_sts = 'O'")
List<String> getAvailableEmptyInSite();
- @Select("select station_code from agv_bas_devp where floor = #{floor} and cache_shelves = 'Y' group by station_code")
+ @Select("select station_code from agv_bas_devp where floor = #{floor} and cache_shelves = 'N' and in_enable = 'Y' group by station_code")
List<String> selectCacheShelvesStationCodeByFloor(@Param("floor") int floor);
@Select("SELECT\n" +
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 574f05e..89b6f8c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -8,7 +8,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -583,20 +582,44 @@
if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
}
- if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
- throw new CoolException("璇ユ枡绠变綅缁勬墭");
+
+ AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", containerCode));
+
+ //鎷ｆ枡銆佺洏鐐瑰畬鎴愪换鍔�
+ if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
+ //鐢熸垚鎷ｆ枡銆佺洏鐐瑰啀鍏ュ簱浠诲姟
+ 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();
}
- //鍘绘壘agv宸ヤ綔妗ｄ换鍔�
- if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode)))){
- throw new CoolException("璇ユ枡绠辨鍦ㄥ叆搴撲腑");
- }
- //缁戝畾绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+ //鍏ュ簱浠诲姟
+ if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+ //鐢熸垚宸ヤ綔妗�
+ List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
+ agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
- //鐢熸垚宸ヤ綔妗�
- 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();
+ }
+
+ return R.error("娌℃湁鏌ヨ鍒拌鏂欑淇℃伅");
+
+ }
+
+ /*
+ 鏄剧ずAGV杈撻�佺嚎鎷ｆ枡銆佺洏鐐广�佸叆搴撲俊鎭�
+ */
+ @PostMapping("/info")
+ @ResponseBody
+ public R showAgvBasDevInfo(@RequestBody ReplenishmentParam param){
return R.ok();
--
Gitblit v1.9.1