From d5f16640dc1bf0239beafab721480a64425d9c1e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 七月 2025 10:46:12 +0800
Subject: [PATCH] 调拔功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 196 +++++++++++++++++++++++++++---------------------
1 files changed, 111 insertions(+), 85 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
index 6474f6e..968131f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -25,6 +26,7 @@
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
+
import java.io.Serializable;
@Data
@@ -37,38 +39,38 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String code;
/**
* PO鍗曞彿
*/
- @ApiModelProperty(value= "PO鍗曞彿")
+ @ApiModelProperty(value = "PO鍗曞彿")
private String poCode;
/**
* PO鍗曟嵁鏍囪瘑
*/
- @ApiModelProperty(value= "PO鍗曟嵁鏍囪瘑")
+ @ApiModelProperty(value = "PO鍗曟嵁鏍囪瘑")
private Long poId;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
private String type;
/**
* 涓氬姟绫诲瀷
*/
- @ApiModelProperty(value= "涓氬姟绫诲瀷")
+ @ApiModelProperty(value = "涓氬姟绫诲瀷")
private String wkType;
@ApiModelProperty("鐩樼偣绫诲瀷")
@@ -77,7 +79,7 @@
/**
* 閫佽揣鏁伴噺
*/
- @ApiModelProperty(value= "閫佽揣鏁伴噺")
+ @ApiModelProperty(value = "閫佽揣鏁伴噺")
private Double anfme;
@ApiModelProperty("鎵ц鏁伴噺")
@@ -86,13 +88,13 @@
/**
* 宸叉敹鏁伴噺
*/
- @ApiModelProperty(value= "宸叉敹鏁伴噺")
+ @ApiModelProperty(value = "宸叉敹鏁伴噺")
private Double qty;
/**
* 鐗╂祦鍗曞彿
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
private String logisNo;
@ApiModelProperty("娉㈡ID")
@@ -101,8 +103,8 @@
/**
* 棰勮鍒拌揪鏃堕棿
*/
- @ApiModelProperty(value= "棰勮鍒拌揪鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "棰勮鍒拌揪鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date arrTime;
/**
@@ -112,9 +114,9 @@
private Integer ntyStatus;
/**
- * 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
+ * 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
*/
- @ApiModelProperty(value= "閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀� ")
+ @ApiModelProperty(value = "閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀� ")
private Short rleStatus;
@@ -122,59 +124,60 @@
private Short exceStatus;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
private Integer deleted;
/**
* 绉熸埛
*/
- @ApiModelProperty(value= "绉熸埛")
+ @ApiModelProperty(value = "绉熸埛")
private Integer tenantId;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public WkOrder() {}
+ public WkOrder() {
+ }
public WkOrder(String code, String poCode, Long poId, String type, String wkType, Double anfme, Double qty, String logisNo, Date arrTime, Short rleStatus, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.code = code;
@@ -198,7 +201,7 @@
}
public String getExceStatus$() {
- if (Cools.isEmpty(this.exceStatus)){
+ if (Cools.isEmpty(this.exceStatus)) {
return "";
}
String exceType = DictTypeCode.DICT_ASN_EXCE_STATUS;
@@ -216,42 +219,57 @@
}
- public String getType$(){
- if (Cools.isEmpty(this.type)){
+ public String getType$() {
+ return OrderType.getValType(this.type);
+
+// if (this.type.equals(OrderType.ORDER_TRANSFER.type)) {
+// return OrderType.getValType(this.type);
+// } else {
+// if (Cools.isEmpty(this.type)) {
+// return "";
+// }
+// DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+// DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+// .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
+// .eq(DictData::getValue, this.type));
+// if (Objects.isNull(dictData)) {
+// return null;
+// }
+// return dictData.getLabel();
+// }
+ }
+
+ public String getWkType$() {
+// if (this.type.equals(OrderType.ORDER_TRANSFER.type)) {
+ return OrderWorkType.getWorkDesc(this.wkType);
+// } else {
+// String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
+// if (type.equals(OrderType.ORDER_CHECK.type)) {
+// typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
+// }
+// if (Cools.isEmpty(this.wkType)) {
+// return "";
+// }
+// DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+// DictData dictData = dictDataService
+// .getOne(new LambdaQueryWrapper<DictData>()
+// .eq(DictData::getDictTypeCode, typeCode)
+// .eq(DictData::getValue, this.wkType));
+// if (Objects.isNull(dictData)) {
+// return null;
+// }
+// return dictData.getLabel();
+// }
+ }
+
+ public String getCheckType$() {
+ if (Cools.isEmpty(this.checkType)) {
return "";
}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
- .eq(DictData::getValue, this.type));
- if (Objects.isNull(dictData)) {
- return null;
- }
- return dictData.getLabel();
- }
-
- public String getWkType$(){
- String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
- if (type.equals(OrderType.ORDER_CHECK.type)) {
- typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
- }
- if (Cools.isEmpty(this.wkType)){
- return "";
- }
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, typeCode).eq(DictData::getValue, this.wkType));
- if (Objects.isNull(dictData)) {
- return null;
- }
- return dictData.getLabel();
- }
-
- public String getCheckType$(){
- if (Cools.isEmpty(this.checkType)){
- return "";
- }
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE).eq(DictData::getValue, this.checkType));
+ .eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE)
+ .eq(DictData::getValue, this.checkType));
if (Objects.isNull(dictData)) {
return null;
}
@@ -259,28 +277,32 @@
}
- public String getArrTime$(){
- if (Cools.isEmpty(this.arrTime)){
+ public String getArrTime$() {
+ if (Cools.isEmpty(this.arrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.arrTime);
}
- public String getRleStatus$(){
- if (null == this.rleStatus){ return null; }
- switch (this.rleStatus){
+ public String getRleStatus$() {
+ if (null == this.rleStatus) {
+ return null;
+ }
+ switch (this.rleStatus) {
case 0:
return " 姝ｅ父";
- case 1:
+ case 1:
return " 宸查噴鏀�";
default:
return String.valueOf(this.rleStatus);
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -290,43 +312,44 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
-
- public Boolean getStatusBool(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public Boolean getStatusBool() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return true;
case 0:
@@ -335,9 +358,12 @@
return null;
}
}
- public String getNtyStatus$(){
- if (null == this.ntyStatus){ return "error"; }
- switch (this.ntyStatus){
+
+ public String getNtyStatus$() {
+ if (null == this.ntyStatus) {
+ return "error";
+ }
+ switch (this.ntyStatus) {
case 0:
return "鏈笂鎶�";
case 1:
--
Gitblit v1.9.1