From 43c6e4ca1e4a7db22c1c2da4a40d90b0535c1c5c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 15:55:52 +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/api/entity/dto/ReceiptDetlsDto.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
index 426cf07..e5a383f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.api.entity.dto;
import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.api.controller.params.ReceiptParams;
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
@@ -9,8 +10,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
import java.util.Map;
/**
@@ -52,14 +55,23 @@
@ApiModelProperty("璐ㄦ缁撴灉")
private String inspect;
+ @ApiModelProperty("閲嶉噺")
+ private Double weigth;
+
@ApiModelProperty("閲囪喘鍗曚綅")
private String purUnit;
@ApiModelProperty("搴撳瓨鍗曚綅")
private String stockUnit;
+ @ApiModelProperty("鏀惰揣鏃ユ湡")
+ private String prodTime;
+
@ApiModelProperty("閲囪喘鏁伴噺")
private Double purQty;
+
+ @ApiModelProperty("瀹為檯閫佽揣鏁伴噺")
+ private Double anfme;
@ApiModelProperty("鏀惰揣鏁伴噺")
private Double receiptQty;
@@ -73,18 +85,6 @@
@ApiModelProperty("鎵╁睍瀛楁")
private Map<String, Object> extendFields;
- public static void main(String[] args) {
- String abc = "";
- String s = CommonUtil.randomUUID16();
- System.out.println("閲嶅瀛楃涓诧細" + s);
-// for (int i = 0; i < 10000; i++) {
-// String s = CommonUtil.randomUUID16();
-// if (abc.equals(s)) {
-// System.out.println("閲嶅瀛楃涓诧細" + abc);
-// }
-// abc = s;
-// }
- }
}
--
Gitblit v1.9.1