From 76c5ad320495758d4e76d852d96914f1b405ece7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 11:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
index f9c7d7b..196cbe4 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -57,6 +55,9 @@
@ApiModelProperty(value = "鍒�鍏稩D")
@Dict(dictTable = "cms_cutting_tool",dicCode="id",dicText = "cutting_code")
private String cuttingId;
+
+ @TableField(exist = false) // 琛ㄧず杩欎笉鏄暟鎹簱瀛楁
+ private String cuttingCode;
/**鍒�鍏锋潯鐮�*/
@Excel(name = "鍒�鍏锋潯鐮�", width = 15)
@ApiModelProperty(value = "鍒�鍏锋潯鐮�")
@@ -69,4 +70,18 @@
@Excel(name = "褰撳墠瀵垮懡(鐧惧垎姣�)", width = 15)
@ApiModelProperty(value = "褰撳墠瀵垮懡(鐧惧垎姣�)")
private BigDecimal currentLife;
+
+ // 鍦–uttingInventory瀹炰綋绫讳腑娣诲姞
+ @TableField(exist = false) // 琛ㄧず杩欎笉鏄暟鎹簱瀛楁
+ private String cuttingIdSearch;
+
+ @TableField(exist = false) // 琛ㄧず杩欎笉鏄暟鎹簱瀛楁
+ private String cuttingBarcodeSearch;
+
+ @TableField(exist = false) // 琛ㄧず杩欎笉鏄暟鎹簱瀛楁
+ private String workpieceMaterial;
+
+ @TableField(exist = false) // 琛ㄧず杩欎笉鏄暟鎹簱瀛楁
+ private BigDecimal ratedLife;
+
}
--
Gitblit v1.9.3