From f34da12c558d57d156529e23c04e2388e60b94e5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 14 六月 2023 10:27:17 +0800
Subject: [PATCH] #组托逻辑
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 ++-
src/main/resources/application.yml | 4 ++--
src/main/webapp/static/js/orderCheck/orderCheck.js | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index efb7249..fb062fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -177,7 +177,8 @@
}
Double anfme = orderDetl.getAnfme();
- if ( anfme > (anfme - sum)) {
+ Double workQty = orderDetl.getWorkQty();
+ if ( anfme - (workQty+sum) < 0) {
throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a5d3924..8c1dc06 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,8 +14,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs
+ url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js
index d1ad18c..fdc8cc0 100644
--- a/src/main/webapp/static/js/orderCheck/orderCheck.js
+++ b/src/main/webapp/static/js/orderCheck/orderCheck.js
@@ -774,7 +774,7 @@
layer.closeAll();
layer.load(1, {shade: [0.1,'#fff']});
// location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
- location.href = "http://10.10.10.100:58080/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+ location.href = "http://10.114.97.100:8080/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
layer.closeAll('loading');
});
}
--
Gitblit v1.9.1