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/result/LoginResult.java | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
index 86e014d..ff94fbd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
@@ -1,24 +1,46 @@
-package com.zy.asrs.wms.system.controller.result;
-
-import com.zy.asrs.wms.system.entity.User;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * Created by vincent on 1/30/2024
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class LoginResult implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String accessToken;
-
- private User user;
-
-}
+package com.zy.asrs.wms.system.controller.result;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.zy.asrs.wms.system.entity.User;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by vincent on 1/30/2024
+ */
+@Data
+@NoArgsConstructor
+public class LoginResult implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String accessToken;
+
+ private Map<String, Object> user;
+
+ public LoginResult(String accessToken, User user) {
+ this.accessToken = accessToken;
+
+ HashMap<String, Object> userMap = new HashMap<>();
+ userMap.put("username", user.getUsername());
+ userMap.put("nickname", user.getNickname());
+ userMap.put("avatar", user.getAvatar());
+ userMap.put("code", user.getCode());
+ userMap.put("sex", user.getSex());
+ userMap.put("phone", user.getPhone());
+ userMap.put("email", user.getEmail());
+ userMap.put("emailVerified", user.getEmailVerified());
+ userMap.put("deptId", user.getDeptId());
+ userMap.put("realName", user.getRealName());
+ userMap.put("hostId", user.getHostId());
+ userMap.put("status", user.getStatus());
+ userMap.put("memo", user.getMemo());
+ this.user = userMap;
+ }
+}
--
Gitblit v1.9.1