From 76888e902446d2f0162a9afcac6a2df870f3764d Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 05 十一月 2024 17:17:28 +0800 Subject: [PATCH] #优化 --- src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 8 +++++++- src/main/resources/application.yml | 4 ++-- 2 files changed, 9 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 3d635a7..d22feea 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -164,6 +164,12 @@ 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()); } + Order order = orderService.selectByNo(orderDetl.getOrderNo()); + if (order.getSettle() == 1) { + if (!orderService.updateSettle(order.getId(), 2L, userId)) { + throw new CoolException("鍐嶆鎷f枡锛氭洿鏂拌鍗曠姸鎬佸け璐ワ紒"); + } + } } // 纭鏄惁鍏ㄩ儴鍑哄簱 double totleWrkdetl = 0.0; @@ -183,7 +189,7 @@ // agvLocDetls.size() == 1 - return "缁勬墭鎴愬姛锛岀粦瀹氱珯鐐规垚鍔�"; + return "鎷f枡鎴愬姛"; } /* diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 075e5e1..9688594 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,8 +10,8 @@ enabled: false datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - #url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs - url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs + url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs +# url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs username: sa password: sa@123 mvc: -- Gitblit v1.9.1