From c635d78b479510ebe2556a420948effcd30a0731 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 十二月 2024 18:40:43 +0800
Subject: [PATCH] 新建德森项目分支
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java | 524 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 262 insertions(+), 262 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java
index dda6c7a..a21b3eb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java
@@ -1,262 +1,262 @@
-package com.zy.asrs.wms.asrs.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.utils.Synchro;
-import com.zy.asrs.wms.asrs.service.OrderSettleService;
-import com.zy.asrs.wms.asrs.service.OrderTypeService;
-import com.zy.asrs.wms.system.entity.Host;
-import com.zy.asrs.wms.system.entity.User;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wms.system.service.UserService;
-import com.zy.asrs.wms.system.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("man_order_log")
-public class OrderLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.INPUT)
- private Long id;
-
- /**
- * 璁㈠崟缂栧彿
- */
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
- private String orderNo;
-
- /**
- * 鍗曟嵁鏃ユ湡
- */
- @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
- private String orderTime;
-
- /**
- * 鍗曟嵁绫诲瀷
- */
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- private Long orderType;
-
- /**
- * 鍗曟嵁鐘舵��
- */
- @ApiModelProperty(value= "鍗曟嵁鐘舵��")
- private Long orderSettle;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @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;
-
- /**
- * 浼樺厛绾�
- */
- @ApiModelProperty(value= "浼樺厛绾�")
- private Integer ioPri;
-
- /**
- * 娉㈡ID
- */
- @ApiModelProperty(value= "娉㈡ID")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
- private Long waveId;
-
- /**
- * 娉㈡鍙�
- */
- @ApiModelProperty(value= "娉㈡鍙�")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
- private String waveNo;
-
- /**
- * 鏄惁鐢熸垚娉㈡ 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鐢熸垚娉㈡ 1: 鏄� 0: 鍚� ")
- private Integer hasWave;
-
- public OrderLog() {}
-
- public OrderLog(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
- this.orderNo = orderNo;
- this.orderTime = orderTime;
- this.orderType = orderType;
- this.orderSettle = orderSettle;
- this.hostId = hostId;
- this.status = status;
- this.deleted = deleted;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- }
-
-// OrderLog orderLog = new OrderLog(
-// null, // 璁㈠崟缂栧彿
-// null, // 鍗曟嵁鏃ユ湡
-// null, // 鍗曟嵁绫诲瀷
-// null, // 鍗曟嵁鐘舵��
-// null, // 鎵�灞炴満鏋�
-// null, // 鐘舵��
-// null, // 鏄惁鍒犻櫎
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public String getOrderType$(){
- OrderTypeService service = SpringUtils.getBean(OrderTypeService.class);
- OrderType orderType = service.getById(this.orderType);
- if (!Cools.isEmpty(orderType)){
- return String.valueOf(orderType.getName());
- }
- return null;
- }
-
- public String getOrderSettle$(){
- OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
- OrderSettle orderSettle = service.getById(this.orderSettle);
- if (!Cools.isEmpty(orderSettle)){
- return String.valueOf(orderSettle.getName());
- }
- 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 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;
- }
-
- public void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
-}
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.wms.asrs.service.OrderSettleService;
+import com.zy.asrs.wms.asrs.service.OrderTypeService;
+import com.zy.asrs.wms.system.entity.Host;
+import com.zy.asrs.wms.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.UserService;
+import com.zy.asrs.wms.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_order_log")
+public class OrderLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.INPUT)
+ private Long id;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ private String orderNo;
+
+ /**
+ * 鍗曟嵁鏃ユ湡
+ */
+ @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ private String orderTime;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ private Long orderType;
+
+ /**
+ * 鍗曟嵁鐘舵��
+ */
+ @ApiModelProperty(value= "鍗曟嵁鐘舵��")
+ private Long orderSettle;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @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;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Integer ioPri;
+
+ /**
+ * 娉㈡ID
+ */
+ @ApiModelProperty(value= "娉㈡ID")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Long waveId;
+
+ /**
+ * 娉㈡鍙�
+ */
+ @ApiModelProperty(value= "娉㈡鍙�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private String waveNo;
+
+ /**
+ * 鏄惁鐢熸垚娉㈡ 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鐢熸垚娉㈡ 1: 鏄� 0: 鍚� ")
+ private Integer hasWave;
+
+ public OrderLog() {}
+
+ public OrderLog(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.orderNo = orderNo;
+ this.orderTime = orderTime;
+ this.orderType = orderType;
+ this.orderSettle = orderSettle;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// OrderLog orderLog = new OrderLog(
+// null, // 璁㈠崟缂栧彿
+// null, // 鍗曟嵁鏃ユ湡
+// null, // 鍗曟嵁绫诲瀷
+// null, // 鍗曟嵁鐘舵��
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getOrderType$(){
+ OrderTypeService service = SpringUtils.getBean(OrderTypeService.class);
+ OrderType orderType = service.getById(this.orderType);
+ if (!Cools.isEmpty(orderType)){
+ return String.valueOf(orderType.getName());
+ }
+ return null;
+ }
+
+ public String getOrderSettle$(){
+ OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
+ OrderSettle orderSettle = service.getById(this.orderSettle);
+ if (!Cools.isEmpty(orderSettle)){
+ return String.valueOf(orderSettle.getName());
+ }
+ 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 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;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+}
--
Gitblit v1.9.1