From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java | 141 +++++++++++++++++++++++------------------------
1 files changed, 69 insertions(+), 72 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
index ddece93..b3a784b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
@@ -1,72 +1,69 @@
-package com.zy.asrs.wms.system.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.enums.LoginSystemType;
-import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.system.entity.Role;
-import com.zy.asrs.wms.system.entity.User;
-import com.zy.asrs.wms.system.entity.UserLogin;
-import com.zy.asrs.wms.system.service.UserLoginService;
-import com.zy.asrs.wms.system.service.UserRoleService;
-import com.zy.asrs.wms.system.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by vincent on 1/30/2024
- */
-public class BaseController {
-
- @Autowired
- private UserLoginService userLoginService;
- @Autowired
- private UserRoleService userRoleService;
- @Autowired
- private UserService userService;
-
- public User getLoginUser() {
- try {
- Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- if (authentication != null) {
- Object object = authentication.getPrincipal();
- if (object instanceof User) {
- return (User) object;
- }
- if(object instanceof UserLogin) {
- UserLogin userLogin = (UserLogin) object;
- User user = userService.superGetById(userLogin.getUserId());
- return user;
- }
- }
- } catch (Exception e) {
- System.out.println(e.getMessage());
- }
- return null;
- }
-
- public Long getLoginUserId() {
- User loginUser = getLoginUser();
- return loginUser == null ? null : loginUser.getId();
- }
-
- public Long getHostId() {
- User loginUser = getLoginUser();
- return loginUser.getHostId();
- }
-
- public <T extends BaseParam> T buildParam(Map<String, Object> map, Class<T> clz) {
- T t = null;
- try {
- t = clz.getDeclaredConstructor().newInstance();
- t.syncMap(map);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return t;
- }
-
-}
+package com.zy.asrs.wms.system.controller;
+
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.system.entity.User;
+import com.zy.asrs.wms.system.entity.UserLogin;
+import com.zy.asrs.wms.system.service.UserLoginService;
+import com.zy.asrs.wms.system.service.UserRoleService;
+import com.zy.asrs.wms.system.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import java.util.*;
+
+/**
+ * Created by vincent on 1/30/2024
+ */
+public class BaseController {
+
+ protected static final String RANGE_TIME_LINK = " - ";
+
+ @Autowired
+ private UserLoginService userLoginService;
+ @Autowired
+ private UserRoleService userRoleService;
+ @Autowired
+ private UserService userService;
+
+ public User getLoginUser() {
+ try {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication != null) {
+ Object object = authentication.getPrincipal();
+ if (object instanceof User) {
+ return (User) object;
+ }
+ if(object instanceof UserLogin) {
+ UserLogin userLogin = (UserLogin) object;
+ User user = userService.superGetById(userLogin.getUserId());
+ return user;
+ }
+ }
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ }
+ return null;
+ }
+
+ public Long getLoginUserId() {
+ User loginUser = getLoginUser();
+ return loginUser == null ? 1 : loginUser.getId();
+ }
+
+ public Long getHostId() {
+ User loginUser = getLoginUser();
+ return loginUser == null ? 1 : loginUser.getHostId();
+ }
+
+ public <T extends BaseParam> T buildParam(Map<String, Object> map, Class<T> clz) {
+ T t = null;
+ try {
+ t = clz.getDeclaredConstructor().newInstance();
+ t.syncMap(map);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return t;
+ }
+
+}
--
Gitblit v1.9.1