From dc07f8dfebabfc695bfe5fc4d65083eb2a23d728 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 07 十一月 2023 08:22:47 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/WcsController.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 76cd9f5..5524d58 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -53,6 +53,8 @@ private AgvWorkService agvWorkService; @Autowired private AgvBasDevpService agvBasDevpService; + @Autowired + private AgvWrkMastService agvWrkMastService; // @Autowired // private ErpService erpService; @@ -345,9 +347,13 @@ AgvBasDevp agvBasDevp = agvBasDevpService.getByDevNo(param.getDevNo()); if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){ - //鍘绘壘agv宸ヤ綔妗d换鍔� throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖"); } + //鍘绘壘agv宸ヤ綔妗d换鍔� + if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>() + .eq("barcode",containerCode)))){ + throw new CoolException("璇ユ枡绠辨鍦ㄥ叆搴撲腑"); + } //缁戝畾绔欑偣 agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode); -- Gitblit v1.9.1