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/Menu.java | 614 +++++++++++++++++++++++++++---------------------------
1 files changed, 307 insertions(+), 307 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java
index 5d3d600..0aa5512 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java
@@ -1,307 +1,307 @@
-package com.zy.asrs.wms.system.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-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 org.springframework.security.core.GrantedAuthority;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@TableName("sys_menu")
-public class Menu implements Serializable, GrantedAuthority {
-
- private static final long serialVersionUID = 1L;
-
- public static final int TYPE_MENU = 0; // 鑿滃崟绫诲瀷
- public static final int TYPE_BTN = 1; // 鎸夐挳绫诲瀷
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鍚嶇О
- */
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
-
- /**
- * 涓婄骇鑿滃崟
- */
- @ApiModelProperty(value= "涓婄骇鑿滃崟")
- private Long parentId;
-
- /**
- * 涓婄骇鑿滃崟鍚�
- */
- @ApiModelProperty(value= "涓婄骇鑿滃崟鍚�")
- private String parentName;
-
- /**
- * 鍏宠仈璺緞
- */
- @ApiModelProperty(value= "鍏宠仈璺緞")
- private String path;
-
- /**
- * 鍏宠仈璺緞鍚�
- */
- @ApiModelProperty(value= "鍏宠仈璺緞鍚�")
- private String pathName;
-
- /**
- * 璺敱鍦板潃
- */
- @ApiModelProperty(value= "璺敱鍦板潃")
- private String route;
-
- /**
- * 椤甸潰缁勪欢
- */
- @ApiModelProperty(value= "椤甸潰缁勪欢")
- private String component;
-
- /**
- * 绠�杩�
- */
- @ApiModelProperty(value= "绠�杩�")
- private String brief;
-
- /**
- * 鏍囪瘑
- */
- @ApiModelProperty(value= "鏍囪瘑")
- private String code;
-
- /**
- * 绫诲瀷 0: 鑿滃崟 1: 鎸夐挳
- */
- @ApiModelProperty(value= "绫诲瀷 0: 鑿滃崟 1: 鎸夐挳 ")
- private Integer type;
-
- /**
- * 鏉冮檺鏍囪瘑
- */
- @ApiModelProperty(value= "鏉冮檺鏍囪瘑")
- private String authority;
-
- /**
- * 鑿滃崟鍥炬爣
- */
- @ApiModelProperty(value= "鑿滃崟鍥炬爣")
- private String icon;
-
- /**
- * 鎺掑簭
- */
- @ApiModelProperty(value= "鎺掑簭")
- private Integer sort;
-
- /**
- * 鍏冧俊鎭�
- */
- @ApiModelProperty(value= "鍏冧俊鎭�")
- private String meta;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @ApiModelProperty(value= "鎵�灞炴満鏋�")
- private Long hostId;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
- private Integer deleted;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鍥介檯鍖朓D
- */
- @ApiModelProperty(value= "鍥介檯鍖朓D")
- private String languageId;
-
- @TableField(exist = false)
- private List<Menu> children;
-
- public Menu() {}
-
- public Menu(String name, Long parentId, String parentName, String path, String pathName, String route, String component, String brief, String code, Integer type, String authority, String icon, Integer sort, String meta, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
- this.name = name;
- this.parentId = parentId;
- this.parentName = parentName;
- this.path = path;
- this.pathName = pathName;
- this.route = route;
- this.component = component;
- this.brief = brief;
- this.code = code;
- this.type = type;
- this.authority = authority;
- this.icon = icon;
- this.sort = sort;
- this.meta = meta;
- this.hostId = hostId;
- this.status = status;
- this.deleted = deleted;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- }
-
- // Menu menu = new Menu(
-// null, // 鍚嶇О[闈炵┖]
-// null, // 涓婄骇鑿滃崟
-// null, // 涓婄骇鑿滃崟鍚�
-// null, // 鍏宠仈璺緞
-// null, // 鍏宠仈璺緞鍚�
-// null, // 璺敱鍦板潃
-// null, // 绠�杩�
-// null, // 鏍囪瘑
-// null, // 绫诲瀷
-// null, // 鏉冮檺鏍囪瘑
-// null, // 鑿滃崟鍥炬爣
-// null, // 鎺掑簭
-// null, // 鍏冧俊鎭�
-// null, // 鎵�灞炴満鏋�
-// null, // 鐘舵��
-// null, // 鏄惁鍒犻櫎
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
- case 0:
- return "鑿滃崟";
- case 1:
- return "鎸夐挳";
- default:
- return String.valueOf(this.type);
- }
- }
-
- public String getHostId$(){
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.getById(this.hostId);
- if (!Cools.isEmpty(host)){
- return String.valueOf(host.getId());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
-
-}
+package com.zy.asrs.wms.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+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 org.springframework.security.core.GrantedAuthority;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName("sys_menu")
+public class Menu implements Serializable, GrantedAuthority {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final int TYPE_MENU = 0; // 鑿滃崟绫诲瀷
+ public static final int TYPE_BTN = 1; // 鎸夐挳绫诲瀷
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * 涓婄骇鑿滃崟
+ */
+ @ApiModelProperty(value= "涓婄骇鑿滃崟")
+ private Long parentId;
+
+ /**
+ * 涓婄骇鑿滃崟鍚�
+ */
+ @ApiModelProperty(value= "涓婄骇鑿滃崟鍚�")
+ private String parentName;
+
+ /**
+ * 鍏宠仈璺緞
+ */
+ @ApiModelProperty(value= "鍏宠仈璺緞")
+ private String path;
+
+ /**
+ * 鍏宠仈璺緞鍚�
+ */
+ @ApiModelProperty(value= "鍏宠仈璺緞鍚�")
+ private String pathName;
+
+ /**
+ * 璺敱鍦板潃
+ */
+ @ApiModelProperty(value= "璺敱鍦板潃")
+ private String route;
+
+ /**
+ * 椤甸潰缁勪欢
+ */
+ @ApiModelProperty(value= "椤甸潰缁勪欢")
+ private String component;
+
+ /**
+ * 绠�杩�
+ */
+ @ApiModelProperty(value= "绠�杩�")
+ private String brief;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏍囪瘑")
+ private String code;
+
+ /**
+ * 绫诲瀷 0: 鑿滃崟 1: 鎸夐挳
+ */
+ @ApiModelProperty(value= "绫诲瀷 0: 鑿滃崟 1: 鎸夐挳 ")
+ private Integer type;
+
+ /**
+ * 鏉冮檺鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏉冮檺鏍囪瘑")
+ private String authority;
+
+ /**
+ * 鑿滃崟鍥炬爣
+ */
+ @ApiModelProperty(value= "鑿滃崟鍥炬爣")
+ private String icon;
+
+ /**
+ * 鎺掑簭
+ */
+ @ApiModelProperty(value= "鎺掑簭")
+ private Integer sort;
+
+ /**
+ * 鍏冧俊鎭�
+ */
+ @ApiModelProperty(value= "鍏冧俊鎭�")
+ private String meta;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 鍥介檯鍖朓D
+ */
+ @ApiModelProperty(value= "鍥介檯鍖朓D")
+ private String languageId;
+
+ @TableField(exist = false)
+ private List<Menu> children;
+
+ public Menu() {}
+
+ public Menu(String name, Long parentId, String parentName, String path, String pathName, String route, String component, String brief, String code, Integer type, String authority, String icon, Integer sort, String meta, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
+ this.name = name;
+ this.parentId = parentId;
+ this.parentName = parentName;
+ this.path = path;
+ this.pathName = pathName;
+ this.route = route;
+ this.component = component;
+ this.brief = brief;
+ this.code = code;
+ this.type = type;
+ this.authority = authority;
+ this.icon = icon;
+ this.sort = sort;
+ this.meta = meta;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+ // Menu menu = new Menu(
+// null, // 鍚嶇О[闈炵┖]
+// null, // 涓婄骇鑿滃崟
+// null, // 涓婄骇鑿滃崟鍚�
+// null, // 鍏宠仈璺緞
+// null, // 鍏宠仈璺緞鍚�
+// null, // 璺敱鍦板潃
+// null, // 绠�杩�
+// null, // 鏍囪瘑
+// null, // 绫诲瀷
+// null, // 鏉冮檺鏍囪瘑
+// null, // 鑿滃崟鍥炬爣
+// null, // 鎺掑簭
+// null, // 鍏冧俊鎭�
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case 0:
+ return "鑿滃崟";
+ case 1:
+ return "鎸夐挳";
+ default:
+ return String.valueOf(this.type);
+ }
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getId());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
--
Gitblit v1.9.1