From 1d915922d8197aa5d5dc3e40e3088d983dd6e141 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg

---
 src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 103 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java
new file mode 100644
index 0000000..352c3f3
--- /dev/null
+++ b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java
@@ -0,0 +1,103 @@
+package com.ruoyi.consumables.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("consumables_in_record")
+@ApiModel("鍏ュ簱绠＄悊")
+public class ConsumablesInRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 搴忓彿
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "鍏ュ簱鎵规")
+    private String inboundBatches;
+
+    @ApiModelProperty(value = "鍏ュ簱鏁伴噺")
+    private BigDecimal consumablesInNum;
+
+    @ApiModelProperty(value = "璁板綍绫诲瀷  鏋氫妇")
+    private String recordType;
+
+    @ApiModelProperty(value = "璁板綍ID  ")
+    private Long recordId;
+
+    @ApiModelProperty(value = "浜у搧瑙勬牸ID")
+    private Long productModelId;
+
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+
+    @ApiModelProperty(value = "绫诲瀷  0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
+    private String type;
+
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @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