src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/OpenService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.Map; /** * Created by vincent on 2022/4/8 @@ -34,6 +35,7 @@ @Autowired private OpenService openService; @Deprecated @PostMapping("/grouping") @AppAuth(memo = "AGV组托调用") public synchronized R grouping(@RequestHeader(required = false) String appkey, @@ -53,6 +55,22 @@ return openService.grouping(param); } @PostMapping("/barcodeVerificatio") @AppAuth(memo = "AGV调用校验条码") public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey, @RequestBody(required = false) Map<String,String> param, HttpServletRequest request){ auth(appkey, param, request); // 托盘条码 String barcode = param.get("barcode"); if (Cools.isEmpty(barcode)) { return R.parse("条码不能为空"); } return openService.barcodeVerificatio(barcode); } @PostMapping("/outbound") @AppAuth(memo = "AGV出库调用") public synchronized R outbound(@RequestHeader(required = false) String appkey, src/main/java/com/zy/asrs/service/OpenService.java
@@ -16,6 +16,11 @@ R grouping(AgvGroupingParam param); /** * AGV调用校验条码 */ R barcodeVerificatio(String barcode); /** * AGV出库调用 */ R outbound(List<LocDto> locDtos) throws InterruptedException; src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -140,6 +140,28 @@ } @Override public R barcodeVerificatio(String barcode) { if (!barcode.matches("\\d{8}")) { return R.parse("条码不是8位数字:" + barcode); } int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", barcode)); int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", barcode)); int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode)); if (countLoc > 0) { return R.parse("库存已存在该条码:" + barcode); } else if (countWrk > 0) { return R.parse("该条码已生成工作档:" + barcode); } else if (countwait > 0) { return R.parse("该条码已生成入库通知档:" + barcode); } return R.ok("校验成功"); } @Override @Transactional public R outbound(List<LocDto> locDtos) throws InterruptedException { if (Cools.isEmpty(locDtos)) {