From ba69a4fb6db917d5e4d0fb14c37add8ee859b0e1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:51 +0800
Subject: [PATCH] 1.耗材迁移 2.仓储物流新增字段（毛重，皮重，净重） 3.设备保养多选（多条定时任务）
---
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 8ae86d5..2b70d8b 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -28,10 +28,10 @@
@ApiModelProperty(value = "鍏ュ簱鏁伴噺")
private BigDecimal stockInNum;
- @ApiModelProperty(value = "璁板綍绫诲瀷 閲囪喘鍏ュ簱/鐢熶骇鍏ュ簱/璐ㄩ噺鍏ュ簱/鑷畾涔夊叆搴�")
+ @ApiModelProperty(value = "璁板綍绫诲瀷 鏋氫妇")
private String recordType;
- @ApiModelProperty(value = "璁板綍ID salesProductId/ProductrMainId/qualityInspectId/0")
+ @ApiModelProperty(value = "璁板綍ID ")
private Long recordId;
@ApiModelProperty(value = "浜у搧瑙勬牸ID")
@@ -39,6 +39,9 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
+ private String type;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -52,10 +55,48 @@
@ApiModelProperty(value = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@ApiModelProperty(value = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+ @ApiModelProperty("杩囩鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime weighingDate;
+
+ @ApiModelProperty("鍑�閲�")
+ private BigDecimal netWeight;
+ /**
+ * 姣涢噸锛堝崟浣嶏細鍚級
+ */
+ @ApiModelProperty("姣涢噸")
+ private BigDecimal grossWeight;
+
+ /**
+ * 鐨噸锛堝崟浣嶏細鍚級
+ */
+ @ApiModelProperty("鐨噸")
+ private BigDecimal tareWeight;
+
+ /**
+ * 杞︾墝鍙�
+ */
+ @ApiModelProperty("杞︾墝鍙�")
+ private String licensePlateNo;
+
+ /**
+ * 杩囩鍛�
+ */
+ @ApiModelProperty("杩囩鍛�")
+ private String weighingOperator;
+
+ @ApiModelProperty("纾呭崟鏂囦欢璺緞")
+ private String weighbridgeDocPath;
+
+ @ApiModelProperty("浜у搧id")
+ private Long productId;
}
--
Gitblit v1.9.3