From fd4ceb219634c802a69828cdae2102278581ba9f Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 14 一月 2025 14:58:02 +0800 Subject: [PATCH] 优化定时任务,添加自动接单(未完成,逻辑还不清楚),调整环境配置 --- src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java index 21e2a1d..6b192ba 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -179,6 +179,7 @@ // 鏇存柊璁㈠崟 OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", pick.getOrderNo()).eq("matnr", pick.getMatnr()).eq("three_code", pick.getThreeCode())); orderDetl.setQty(orderDetl.getQty() + pick.getCount()); + orderDetl.setUpdateTime(new Date()); if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", pick.getOrderNo()).eq("matnr", pick.getMatnr()).eq("three_code", pick.getThreeCode()))) { throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�" + pick.getOrderNo() + pick.getMatnr()); } @@ -353,6 +354,10 @@ AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", stationCode)); + if (agvBasDevp == null) { + throw new CoolException(stationCode + "绔欑偣淇℃伅閿欒"); + } + if (Cools.eq(agvBasDevp.getBarcode(), barcode)) { return; } @@ -367,9 +372,7 @@ throw new CoolException(barcode + "宸茬粡缁戝畾鍦�" + agvBasDevp.getDevNo() + "绔欑偣"); } - if (agvBasDevp == null) { - throw new CoolException(stationCode + "绔欑偣淇℃伅閿欒"); - } + if (!"O".equals(agvBasDevp.getLocSts())) { throw new CoolException(stationCode + "璇ョ珯鐐硅揣浣嶇姸鎬侀潪绌�"); } -- Gitblit v1.9.1