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/system/entity/User.java |  106 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index 4a818ef..98d856f 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -4,16 +4,16 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.service.HostService;
-import com.zy.system.service.RoleService;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.system.service.HostService;
+import com.zy.system.service.RoleService;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-//import com.zy.system.service.RoleService;
+//import com.zy.sc.system.service.RoleService;
 
 @TableName("sys_user")
 public class User implements Serializable {
@@ -32,13 +32,31 @@
     @TableField("host_id")
     private Long hostId;
 
+
     /**
-     * 鍚嶇О
+     * 鎵�灞為儴闂�
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 瑙掕壊
+     */
+    @TableField("role_id")
+    private Long roleId;
+
+    /**
+     * 璐﹀彿
      */
     private String username;
 
     /**
-     * 璐﹀彿
+     * 鍚嶇О
+     */
+    private String nickname;
+
+    /**
+     * 鎵嬫満鍙�
      */
     private String mobile;
 
@@ -48,10 +66,19 @@
     private String password;
 
     /**
-     * 瑙掕壊
+     * 澶村儚
      */
-    @TableField("role_id")
-    private Long roleId;
+    private String avatar;
+
+    /**
+     * 閭
+     */
+    private String email;
+
+    /**
+     * 鎬у埆 0: 鐢�  1:  濂�   2:  鏈煡
+     */
+    private Integer sex;
 
     /**
      * 娉ㄥ唽鏃堕棿
@@ -93,8 +120,33 @@
         this.hostId = hostId;
     }
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public String getDeptName() {
+//        DeptService service = SpringUtils.getBean(DeptService.class);
+//        Dept dept = service.selectById(this.deptId);
+//        if (!Cools.isEmpty(dept)){
+//            return dept.getName();
+//        }
+        return null;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     public void setUsername(String username) {
         this.username = username;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
     }
 
     public String getMobile() {
@@ -113,6 +165,44 @@
         this.password = password;
     }
 
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public String getSex$(){
+        if (null == this.sex){ return null; }
+        switch (this.sex){
+            case 0:
+                return "鐢�";
+            case 1:
+                return "濂�";
+            case 2:
+                return "鏈煡";
+            default:
+                return String.valueOf(this.sex);
+        }
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
     public Long getRoleId() {
         return roleId;
     }

--
Gitblit v1.9.1