From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 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 f8c4cf4..c79a9b6 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
@@ -4,16 +4,15 @@
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;
@@ -79,6 +78,9 @@
@ApiModelProperty(value= "閫佽揣鏁伴噺")
private Double anfme;
+ @ApiModelProperty("鎵ц鏁伴噺")
+ private Double workQty;
+
/**
* 宸叉敹鏁伴噺
*/
@@ -90,6 +92,9 @@
*/
@ApiModelProperty(value= "鐗╂祦鍗曞彿")
private String logisNo;
+
+ @ApiModelProperty("娉㈡ID")
+ private Long waveId;
/**
* 棰勮鍒拌揪鏃堕棿
@@ -143,6 +148,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;
/**
@@ -156,6 +162,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;
/**
@@ -187,34 +194,14 @@
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));
+ 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;
}
--
Gitblit v1.9.1