From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步，增加水分，挥发段，分解段搜索，按照最大最小范围，包装类型跟托盘类型增加删选功能。 2.已经出库的物料，在明细表里面隐藏掉，但是数据保留。 3.增加二个跟聚乳酸一样的明细表，分改性树脂，纯树脂库存明细表，所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下，相对压缩一下，搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理，举例原有系统里面销售选定的10包物料，再二次重新弄后，车间打印新标签，使用新的包号，在明细表里面体现原有所有指标信息及批号，包号，牌号跟新的关联 7.出库时候时间可选历史，不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择
---
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