From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 （当前牌号 批号 包号可以筛选出唯一物料） 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善
---
src/main/java/com/zy/common/web/RouterController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index e059d01..6b21c8a 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -12,15 +12,13 @@
@Controller
public class RouterController {
- @Value("{spring.application.name}")
- private String applicationName;
+ @Value("${server.servlet.context-path}")
+ private String contextPath;
@RequestMapping("/")
public void index(HttpServletResponse response) {
try{
-// String redirect = "/"+applicationName+"/views/index.html";
- String redirect = "/asrs/views/index.html";
- response.sendRedirect(redirect);
+ response.sendRedirect(contextPath+"/views/index.html");
} catch (Exception ex){
ex.printStackTrace();
}
@@ -29,9 +27,25 @@
@RequestMapping("/login")
public void login(HttpServletResponse response) {
try{
-// String redirect = "/"+applicationName+"/views/login.html";
- String redirect = "/asrs/views/login.html";
- response.sendRedirect(redirect);
+ response.sendRedirect(contextPath+"/views/login.html");
+ } catch (Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ @RequestMapping("/pda")
+ public void pda(HttpServletResponse response) {
+ try{
+ response.sendRedirect(contextPath+"/views/pda/login.html");
+ } catch (Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ @RequestMapping("/pda/ce")
+ public void pdaCe(HttpServletResponse response) {
+ try{
+ response.sendRedirect(contextPath+"/views/pdaCe/login.html");
} catch (Exception ex){
ex.printStackTrace();
}
--
Gitblit v1.9.1