| src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/service/CommonService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/web/WcsController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -50,12 +50,12 @@ throw new CoolException(devpNo+"站点不存在"); } if (pakin) { if(station.getAutoing()==null || !station.getAutoing().equals("Y")) { throw new CoolException(devpNo+"站点不是自动状态"); } if(station.getLoading()==null || !station.getLoading().equals("Y")) { throw new CoolException(devpNo+"站点无物"); } // if(station.getAutoing()==null || !station.getAutoing().equals("Y")) { // throw new CoolException(devpNo+"站点不是自动状态"); // } // if(station.getLoading()==null || !station.getLoading().equals("Y")) { // throw new CoolException(devpNo+"站点无物"); // } if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) { WrkMast wrkMast = wrkMastService.selectById(station.getWrkNo()); src/main/java/com/zy/common/service/CommonService.java
@@ -286,7 +286,7 @@ // 浅库位对应堆垛机必须可用且无异常 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { // 因库位移转、需预留空库位 if (locMastService.checkEmptyCount(locMast0, 10)) { if (locMastService.checkEmptyCount(locMast0, 5)) { locMast = locMast0; break; } @@ -325,7 +325,7 @@ // 浅库位对应堆垛机必须可用且无异常 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { // 因库位移转、需预留空库位 if (locMastService.checkEmptyCount(locMast0, 10)) { if (locMastService.checkEmptyCount(locMast0, 5)) { locMast = locMast0; break; } @@ -354,7 +354,7 @@ // 浅库位对应堆垛机必须可用且无异常 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { // 因库位移转、需预留空库位 if (locMastService.checkEmptyCount(locMast0, 10)) { if (locMastService.checkEmptyCount(locMast0, 5)) { locMast = locMast0; break; } @@ -384,7 +384,7 @@ // 浅库位对应堆垛机必须可用且无异常 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { // 因库位移转、需预留空库位 if (locMastService.checkEmptyCount(locMast0, 10)) { if (locMastService.checkEmptyCount(locMast0, 5)) { locMast = locMast0; flag = true; break; @@ -401,7 +401,7 @@ // 浅库位对应堆垛机必须可用且无异常 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { // 因库位移转、需预留空库位 if (locMastService.checkEmptyCount(locMast0, 10)) { if (locMastService.checkEmptyCount(locMast0, 5)) { locMast = locMast0; flag = true; break; @@ -445,7 +445,7 @@ // 浅库位对应堆垛机必须可用且无异常 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { // 因库位移转、需预留空库位 if (locMastService.checkEmptyCount(locMast0, 10)) { if (locMastService.checkEmptyCount(locMast0, 5)) { locMast = locMast0; } } @@ -548,9 +548,13 @@ if (Cools.isEmpty(staDesc)) { log.error("入库路径不存在, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, locMast.getCrnNo()); if (sourceStaNo==103 && locMast.getCrnNo()==3){ throw new CoolException("请放到203入库口"); throw new CoolException("请放到203入库口--1000"); }else if (sourceStaNo==203 && locMast.getCrnNo()==1){ throw new CoolException("请放到103入库口"); throw new CoolException("请放到103入库口--1000"); }else if (sourceStaNo==113 && locMast.getCrnNo()==3){ throw new CoolException("请放到213入库口--1000"); }else if (sourceStaNo==213 && locMast.getCrnNo()==1){ throw new CoolException("请放到113入库口--1000"); }else { throw new CoolException("入库路径不存在"); } src/main/java/com/zy/common/web/WcsController.java
@@ -82,21 +82,34 @@ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo); StartupDto dto = null; switch (param.getIoType()) { case 1://满托盘入库 assert waitPakins != null; dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins); break; case 10://空托盘入库 dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode()); break; case 103:// 拣料入库 case 104:// 并板入库 case 107:// 盘点入库 dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto); break; default: break; try{ switch (param.getIoType()) { case 1://满托盘入库 assert waitPakins != null; dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins); break; case 10://空托盘入库 dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode()); break; case 103:// 拣料入库 case 104:// 并板入库 case 107:// 盘点入库 dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto); break; default: break; } } catch (Exception e){ String message = e.getMessage(); if (message.contains("--")){ String[] split = message.split("--"); if (!Cools.isEmpty(split) && split.length>=2){ if (split[1].equals("1000")){ return R.parse(CodeRes.NONE_DETL_1000); } } } return R.error().add(e.getMessage()); } if (!Cools.isEmpty(dto) && param.getIoType()<11 && dto.getCrnNo().equals(0) && dto.getWorkNo().equals(9999) && dto.getStaNo().equals(1000)){ return R.parse(CodeRes.NONE_DETL_1000); src/main/webapp/views/index.html
@@ -32,7 +32,7 @@ </head> <body class="layui-layout-body"> <!--倒计时--> <div id="countdown">系统将于2023年12月20日到期</div> <!--<div id="countdown">系统将于2023年12月20日到期</div>--> <div class="layui-layout layui-layout-admin"> <!-- 头部 --> <div class="layui-header">
