From 57f9a55581343a805cd589bbdc00e4d28a28aa97 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 28 七月 2025 13:26:42 +0800
Subject: [PATCH] erp对接
---
src/main/java/com/zy/asrs/entity/Order.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 99abc64..c5a8bed 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -200,16 +200,16 @@
private Date sendTime;
/**
- * 鐗╂祦鍚嶇О
+ * 鐩爣浠撳簱
*/
- @ApiModelProperty(value= "鐗╂祦鍚嶇О")
+ @ApiModelProperty(value= "鐩爣浠撳簱")
@TableField("ship_name")
private String shipName;
/**
- * 鐗╂祦鍗曞彿
+ * 婧愪粨搴�
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value= "婧愪粨搴�")
@TableField("ship_code")
private String shipCode;
@@ -260,6 +260,13 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value= "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @TableField("move_status")
+ private Integer moveStatus;
public Order() {}
@@ -405,6 +412,20 @@
}
}
+ public String getMoveStatus$(){
+ if (null == this.moveStatus){ return null; }
+ switch (this.moveStatus){
+ case 2:
+ return "宸插璐�";
+ case 1:
+ return "澶囪揣涓�";
+ case 0:
+ return "鏈垵濮�";
+ default:
+ return String.valueOf(this.moveStatus);
+ }
+ }
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
--
Gitblit v1.9.1