From 420dea5428d2de1e5c258063d49d4decb57db5ed Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Fri, 7 Jul 2023 11:33:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/auth/AuthUserController.java | 9 +++++++++
 .../glxp/api/controller/inout/IoCodeTempController.java  | 4 ++--
 .../java/com/glxp/api/req/inout/AddOrderRequest.java     | 3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
index f080e0d74..ad15c27e1 100644
--- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
+++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
@@ -136,4 +136,13 @@ public class AuthUserController extends BaseController {
         return ResultVOUtils.success(authAdmin);
     }
 
+    //查询用户名信息
+    @AuthRuleAnnotation("")
+    @PostMapping("/admin/auth/admin/updateUser")
+    public BaseResponse updateUser() {
+
+        AuthAdmin authAdmin = customerService.getUserBean();
+        return ResultVOUtils.success(authAdmin);
+    }
+
 }
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index c98593566..98d2ee7b0 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -433,7 +433,7 @@ public class IoCodeTempController extends BaseController {
                 String expireDate = "20" + udiEntity.getExpireDate();
                 long expireTime = MsDateUtil.parseDateExpire(expireDate);
                 if (expireTime - System.currentTimeMillis() < 0) {
-                    return ResultVOUtils.error(604, "当前产品已过期,无法添加?");
+                    return ResultVOUtils.error(604, "当前产品已过期,无法添加!");
                 }
             }
         }
@@ -455,7 +455,7 @@ public class IoCodeTempController extends BaseController {
                 if (resultTime > 0) {
                     long time = resultTime / (24 * 60 * 60 * 1000);
                     if (resultTime < recentTieme) {
-                        return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "天,是否确定继续添加?");
+                        return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "时,是否确定继续添加?");
                     }
                 }
             }
diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java
index f800b82f6..ad736bdca 100644
--- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java
@@ -9,6 +9,7 @@ public class AddOrderRequest {
     private String mainAction;
     private String action;
     private String fromCorp;
+    private String fromCorpName;
     private String fromInvCode;
     private String deptCode;
     private String invCode;
@@ -30,7 +31,7 @@ public class AddOrderRequest {
     private String checkPreInOrders;
     private String selectSupId;
     private Long relId;
-
+    private Integer checkVailDate;
     //    预验收货位
     private String checkPreInSpaceCode;
     private String curSpaceCode;