From d96cb8a176a2cd7406de97b9a6e321f8ecd4c707 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 07:59:54 +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 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 a7174c7..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,15 +55,24 @@
@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;
--
Gitblit v1.9.1