From 462a8c41fb4043017d75148873f9aa0559722ae3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 06 六月 2025 16:25:34 +0800
Subject: [PATCH] 添加下发执行功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java | 159 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 110 insertions(+), 49 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java
index 30cba35..376d34e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java
@@ -1,11 +1,21 @@
package com.vincent.rsf.server.manager.entity;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
import com.baomidou.mybatisplus.annotation.TableLogic;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
@@ -22,10 +32,12 @@
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;
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_delivery")
public class Delivery implements Serializable {
@@ -34,132 +46,139 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 閲囪喘鍗曞彿
*/
- @ApiModelProperty(value= "閲囪喘鍗曞彿")
+ @ApiModelProperty(value = "閲囪喘鍗曞彿")
private String code;
/**
* erp涓诲崟鏍囪瘑
*/
- @ApiModelProperty(value= "erp涓诲崟鏍囪瘑")
+ @ApiModelProperty(value = "erp涓诲崟鏍囪瘑")
private String platId;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
private String type;
/**
* 涓氬姟绫诲瀷
*/
- @ApiModelProperty(value= "涓氬姟绫诲瀷")
+ @ApiModelProperty(value = "涓氬姟绫诲瀷")
private String wkType;
/**
* 鍗曟嵁鏉ユ簮
*/
- @ApiModelProperty(value= "鍗曟嵁鏉ユ簮")
+ @ApiModelProperty(value = "鍗曟嵁鏉ユ簮")
private String source;
/**
* 鍑哄簱鏁伴噺
*/
- @ApiModelProperty(value= "鍑哄簱鏁伴噺")
+ @ApiModelProperty(value = "鍑哄簱鏁伴噺")
private Double anfme;
/**
* 宸插嚭搴撴暟閲�
*/
- @ApiModelProperty(value= "宸插嚭搴撴暟閲�")
+ @ApiModelProperty(value = "宸插嚭搴撴暟閲�")
private Double qty;
/**
* 鎵ц涓暟閲�
*/
- @ApiModelProperty(value= "鎵ц涓暟閲�")
+ @ApiModelProperty(value = "鎵ц涓暟閲�")
private Double workQty;
/**
* 骞冲彴鍗曞彿
*/
- @ApiModelProperty(value= "骞冲彴鍗曞彿")
+ @ApiModelProperty(value = "骞冲彴鍗曞彿")
private String platCode;
/**
* 璁″垝鍑哄簱鏃堕棿
*/
- @ApiModelProperty(value= "璁″垝鍑哄簱鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "璁″垝鍑哄簱鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 璁″垝鍑哄簱缁撴潫鏃堕棿
*/
- @ApiModelProperty(value= "璁″垝鍑哄簱缁撴潫鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "璁″垝鍑哄簱缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
- * 鐘舵�� 1: 宸插畬鎴� 0: 寰呮墽琛� 2: 鏈畬鎴�
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 宸插畬鎴� 0: 寰呮墽琛� 2: 鏈畬鎴� ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤")
private Integer status;
+
+ @ApiModelProperty(value = "鐘舵�� 1: 鎵ц涓� 0: 鏈墽琛� 2: 閮ㄥ垎瀹屾垚 3:宸插畬鎴� ")
+ private Short exceStatus;
+
/**
- * 鏄惁鍒犻櫎 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")
+ @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")
+ @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 Delivery() {}
+ public Delivery() {
+ }
- public Delivery(String code,String platId,String type,String wkType,String source,Double anfme,Double qty,Double workQty,String platCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Delivery(String code, String platId, String type, String wkType, String source, Double anfme, Double qty, Double workQty, String platCode, Date startTime, Date endTime, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.code = code;
this.platId = platId;
this.type = type;
@@ -203,71 +222,113 @@
// null // 澶囨敞
// );
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
+
+ public String getExceStatus$() {
+ if (Cools.isEmpty(this.exceStatus)) {
+ return null;
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.SYS_PO_EXCE_STATUS)
+ .eq(DictData::getValue, this.exceStatus));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
+ public String getType$() {
+ 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 (Cools.isEmpty(this.wkType)) {
+ return "";
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, this.wkType));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
+ public String getStartTime$() {
+ if (Cools.isEmpty(this.startTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
}
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
}
- 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:
return "寰呮墽琛�";
- case 2:
+ case 2:
return " 鏈畬鎴�";
default:
return String.valueOf(this.status);
}
}
- 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:
--
Gitblit v1.9.1