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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 ae83305..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,12 +1,20 @@
package com.vincent.rsf.server.api.entity.dto;
-import io.swagger.annotations.Api;
+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;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.ApiModel;
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;
/**
* @author Ryan
@@ -30,7 +38,7 @@
private String poCode;
@ApiModelProperty("鐗╂枡鍚嶇О")
- private String matnk;
+ private String maktx;
@ApiModelProperty("渚涘簲鍟嗘壒娆�")
private String splrBatch;
@@ -47,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;
@@ -64,4 +81,10 @@
@ApiModelProperty("渚涘簲鍟嗙紪鐮�")
private String splrCode;
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ private Map<String, Object> extendFields;
+
}
+
+
--
Gitblit v1.9.1