From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +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 | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 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..7e2eecd 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,11 @@
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.List;
import java.util.Map;
/**
@@ -24,6 +28,9 @@
@Accessors(chain = true)
@ApiModel(value = "ReceiptDetlsDto", description = "鏀惰揣鏄庣粏淇℃伅")
public class ReceiptDetlsDto implements Serializable {
+
+ @ApiModelProperty("鏄庣粏ID")
+ private Long id;
@ApiModelProperty("鏀惰揣閫氱煡鍗�")
private String asnCode;
@@ -43,6 +50,9 @@
@ApiModelProperty("鏈�澶у簱瀛�")
private Double maxQty;
+ @ApiModelProperty("宸叉敹璐ф暟閲�")
+ private Double qty;
+
@ApiModelProperty("骞冲彴琛屽彿")
private String platformId;
@@ -52,14 +62,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;
@@ -67,24 +86,21 @@
@ApiModelProperty("鐗╂枡鏍囪瘑")
private Long matnrId;
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ private String matnr;
+
@ApiModelProperty("渚涘簲鍟嗙紪鐮�")
private String splrCode;
- @ApiModelProperty("鎵╁睍瀛楁")
- private Map<String, Object> extendFields;
+ @ApiModelProperty("鎵╁睍瀛楁绱㈠紩")
+ private String fieldsIndex;
- 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;
-// }
- }
+ @ApiModelProperty("琛屽彿")
+ private String platItemId;
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ private Map<String, String> extendFields;
+
}
--
Gitblit v1.9.1