From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复）
---
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java | 192 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java
index 02543a1..0b189ca 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java
@@ -1,96 +1,96 @@
-package com.zy.asrs.common.sys.entity;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@TableName("sys_user_login")
-public class UserLogin implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 缂栧彿
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 浠撳簱
- */
- @ApiModelProperty(value= "浠撳簱")
- private Long hostId;
-
- /**
- * 鍛樺伐
- */
- private Long userId;
-
- /**
- * 绫诲瀷 0: 鐧诲綍鎴愬姛 1: 鐧诲綍澶辫触 2: 閫�鍑虹櫥褰� 3: 缁token
- */
- @ApiModelProperty(value= "绫诲瀷 0: 鐧诲綍鎴愬姛 1: 鐧诲綍澶辫触 2: 閫�鍑虹櫥褰� 3: 缁token")
- private Integer type;
-
- /**
- * 鍑瘉鍊�
- */
- private String token;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鐧婚檰绯荤粺
- */
- private String system;
-
- public String getUserUsername(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.userId);
- if (!Cools.isEmpty(user)){
- return user.getUsername();
- }
- return null;
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getType$(){
- if (Cools.isEmpty(this.getType())){
- return "";
- }
- //0: 鐧诲綍鎴愬姛 1: 鐧诲綍澶辫触 2: 閫�鍑虹櫥褰� 3: 缁token
- switch (this.getType()) {
- case 0:
- return "鐧诲綍鎴愬姛";
- case 1:
- return "鐧诲綍澶辫触";
- case 2:
- return "閫�鍑虹櫥褰�";
- case 3:
- return "缁token";
- default:
- return String.valueOf(this.getType());
- }
- }
-
-}
+package com.zy.asrs.common.sys.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("sys_user_login")
+public class UserLogin implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浠撳簱
+ */
+ @ApiModelProperty(value= "浠撳簱")
+ private Long hostId;
+
+ /**
+ * 鍛樺伐
+ */
+ private Long userId;
+
+ /**
+ * 绫诲瀷 0: 鐧诲綍鎴愬姛 1: 鐧诲綍澶辫触 2: 閫�鍑虹櫥褰� 3: 缁token
+ */
+ @ApiModelProperty(value= "绫诲瀷 0: 鐧诲綍鎴愬姛 1: 鐧诲綍澶辫触 2: 閫�鍑虹櫥褰� 3: 缁token")
+ private Integer type;
+
+ /**
+ * 鍑瘉鍊�
+ */
+ private String token;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ private Date createTime;
+
+ /**
+ * 鐧婚檰绯荤粺
+ */
+ private String system;
+
+ public String getUserUsername(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.userId);
+ if (!Cools.isEmpty(user)){
+ return user.getUsername();
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getType$(){
+ if (Cools.isEmpty(this.getType())){
+ return "";
+ }
+ //0: 鐧诲綍鎴愬姛 1: 鐧诲綍澶辫触 2: 閫�鍑虹櫥褰� 3: 缁token
+ switch (this.getType()) {
+ case 0:
+ return "鐧诲綍鎴愬姛";
+ case 1:
+ return "鐧诲綍澶辫触";
+ case 2:
+ return "閫�鍑虹櫥褰�";
+ case 3:
+ return "缁token";
+ default:
+ return String.valueOf(this.getType());
+ }
+ }
+
+}
--
Gitblit v1.9.1