From 72ca54b5a36818de16acf81c9c395e9f35a39a67 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 11 六月 2025 09:53:27 +0800
Subject: [PATCH] 下发执行页，添加默认请求方法
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 108 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index f9fa8da..15833aa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -1,15 +1,18 @@
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 com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
+
import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -75,6 +78,9 @@
@ApiModelProperty(value= "閫佽揣鏁伴噺")
private Double anfme;
+ @ApiModelProperty("鎵ц鏁伴噺")
+ private Double workQty;
+
/**
* 宸叉敹鏁伴噺
*/
@@ -87,11 +93,14 @@
@ApiModelProperty(value= "鐗╂祦鍗曞彿")
private String logisNo;
+ @ApiModelProperty("娉㈡ID")
+ private Long waveId;
+
/**
* 棰勮鍒拌揪鏃堕棿
*/
@ApiModelProperty(value= "棰勮鍒拌揪鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date arrTime;
/**
@@ -106,11 +115,9 @@
@ApiModelProperty(value= "閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀� ")
private Short rleStatus;
- /**
- * 鍚嶇О
- */
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
+
+ @ApiModelProperty("鎵ц鐘舵��")
+ private Short exceStatus;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -142,6 +149,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -155,6 +163,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -165,7 +174,7 @@
public AsnOrder() {}
- public AsnOrder(String code,String poCode,Long poId,String type,String wkType,Double anfme,Double qty,String logisNo,Date arrTime,Short rleStatus,String name,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public AsnOrder(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;
this.poCode = poCode;
this.poId = poId;
@@ -176,7 +185,6 @@
this.logisNo = logisNo;
this.arrTime = arrTime;
this.rleStatus = rleStatus;
- this.name = name;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -187,27 +195,46 @@
this.memo = memo;
}
-// AsnOrder asnOrder = new AsnOrder(
-// null, // 缂栧彿
-// null, // PO鍗曞彿
-// null, // PO鍗曟嵁鏍囪瘑
-// null, // 鍗曟嵁绫诲瀷[闈炵┖]
-// null, // 涓氬姟绫诲瀷[闈炵┖]
-// null, // 閫佽揣鏁伴噺[闈炵┖]
-// null, // 宸叉敹鏁伴噺[闈炵┖]
-// null, // 鐗╂祦鍗曞彿
-// null, // 棰勮鍒拌揪鏃堕棿
-// null, // 閲婃斁鐘舵�乕闈炵┖]
-// null, // 鍚嶇О
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
+ public String getExceStatus$() {
+ if (Cools.isEmpty(this.exceStatus)){
+ return "";
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_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 getArrTime$(){
if (Cools.isEmpty(this.arrTime)){
@@ -285,5 +312,18 @@
return null;
}
}
+ public String getNtyStatus$(){
+ if (null == this.ntyStatus){ return "error"; }
+ switch (this.ntyStatus){
+ case 0:
+ return "鏈笂鎶�";
+ case 1:
+ return "宸蹭笂鎶�";
+ case 2:
+ return "閮ㄥ垎涓婃姤";
+ default:
+ return "error";
+ }
+ }
}
--
Gitblit v1.9.1