From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/common/web/RouterController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index 4112db7..6b21c8a 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -1,6 +1,5 @@
package com.zy.common.web;
-import com.core.common.Cools;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,14 +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 = Cools.isEmpty(applicationName)?"views/index.html":"/"+applicationName+"/views/index.html";
- response.sendRedirect(redirect);
+ response.sendRedirect(contextPath+"/views/index.html");
} catch (Exception ex){
ex.printStackTrace();
}
@@ -29,8 +27,25 @@
@RequestMapping("/login")
public void login(HttpServletResponse response) {
try{
- String redirect = Cools.isEmpty(applicationName)?"/views/login.html":"/"+applicationName+"/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