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/entity/UserLogin.java | 224 ++++++++++++++++++++++++++++----------------------------
1 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserLogin.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserLogin.java
index 5ee90d3..328e9ae 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserLogin.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/UserLogin.java
@@ -1,112 +1,112 @@
-package com.zy.asrs.wms.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wms.system.service.HostService;
-import com.zy.asrs.wms.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@TableName("sys_user_login")
-public class UserLogin implements Serializable {
-
- public static final int TYPE_LOGIN = 0; // 鐧诲綍鎴愬姛
- public static final int TYPE_ERROR = 1; // 鐧诲綍澶辫触
- public static final int TYPE_LOGOUT = 2; // 閫�鍑虹櫥褰�
- public static final int TYPE_REFRESH = 3; // 缁token
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鐢ㄦ埛
- */
- @ApiModelProperty(value= "鐢ㄦ埛")
- private Long userId;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @ApiModelProperty(value= "鎵�灞炴満鏋�")
- private Long hostId;
-
- /**
- * 瀵嗛挜
- */
- @ApiModelProperty(value= "瀵嗛挜")
- private String token;
-
- /**
- * 鐧诲綍ip
- */
- @ApiModelProperty(value= "鐧诲綍ip")
- private String ip;
-
- /**
- * 绫诲瀷
- */
- @ApiModelProperty(value= "绫诲瀷")
- private Integer type;
-
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鐧诲綍绯荤粺
- */
- @ApiModelProperty(value= "鐧诲綍绯荤粺")
- private String system;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- public String getUserId$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.userId);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getHostId$(){
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.getById(this.hostId);
- if (!Cools.isEmpty(host)){
- return String.valueOf(host.getName());
- }
- return null;
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
-
-}
+package com.zy.asrs.wms.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.HostService;
+import com.zy.asrs.wms.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("sys_user_login")
+public class UserLogin implements Serializable {
+
+ public static final int TYPE_LOGIN = 0; // 鐧诲綍鎴愬姛
+ public static final int TYPE_ERROR = 1; // 鐧诲綍澶辫触
+ public static final int TYPE_LOGOUT = 2; // 閫�鍑虹櫥褰�
+ public static final int TYPE_REFRESH = 3; // 缁token
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鐢ㄦ埛
+ */
+ @ApiModelProperty(value= "鐢ㄦ埛")
+ private Long userId;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 瀵嗛挜
+ */
+ @ApiModelProperty(value= "瀵嗛挜")
+ private String token;
+
+ /**
+ * 鐧诲綍ip
+ */
+ @ApiModelProperty(value= "鐧诲綍ip")
+ private String ip;
+
+ /**
+ * 绫诲瀷
+ */
+ @ApiModelProperty(value= "绫诲瀷")
+ private Integer type;
+
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 鐧诲綍绯荤粺
+ */
+ @ApiModelProperty(value= "鐧诲綍绯荤粺")
+ private String systemCode;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public String getUserId$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.userId);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+
+}
--
Gitblit v1.9.1