From 3bf81c083883d4861d53380423ee8a44c899b5f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 18:04:46 +0800
Subject: [PATCH] fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新
---
src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
index 7063498..e56b4f0 100644
--- a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.quality.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.inspectiontask.pojo.QualityInspectItem;
import com.ruoyi.quality.pojo.RawMaterial;
import io.swagger.annotations.ApiModel;
@@ -42,9 +43,11 @@
private List<QualityInspectItem> qualityInspectItem;
@ApiModelProperty("浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О")
private String productName;
@ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String model;
@ApiModelProperty("浜у搧id")
@@ -52,4 +55,7 @@
@ApiModelProperty("鍗曚綅")
private String unit;
+
+ @ApiModelProperty("妫�楠屾棩鏈�")
+ private String checkTimeText;
}
--
Gitblit v1.9.3