From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:16:18 +0800
Subject: [PATCH] art: 选择设备查询逻辑修改， 点检工单新增时产线逻辑修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
index 7b5386f..148ec52 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
@@ -61,7 +61,7 @@
/**
* 涓诲崟浣峣d
*/
- @Excel(name = "涓诲崟浣峣d", width = 15)
+ @Excel(name = "鍗曚綅", width = 15)
@ApiModelProperty(value = "涓诲崟浣峣d")
@Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
private java.lang.String mainUnitId;
@@ -73,24 +73,23 @@
@Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
private java.lang.String auxiliaryUnitId;
- @Excel(name = "浠撳簱id", width = 15)
+ @Excel(name = "浠撳簱", width = 15)
@ApiModelProperty(value = "浠撳簱id")
- @Dict(dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
private java.lang.String warehouseId;
- @Excel(name = "搴撳尯id", width = 15)
+ @Excel(name = "搴撳尯", width = 15)
@ApiModelProperty(value = "搴撳尯id")
@Dict(dictTable = "mom_base_warehouse_area", dicCode = "id", dicText = "name")
private java.lang.String warehouseAreaId;
- @Excel(name = "搴撲綅id", width = 15)
+ @Excel(name = "搴撲綅", width = 15)
@ApiModelProperty(value = "搴撲綅id")
@Dict(dictTable = "mom_base_warehouse_location", dicCode = "id", dicText = "name")
private java.lang.String warehouseLocationId;
/**
* 涓绘暟閲�
*/
- @Excel(name = "涓绘暟閲�", width = 15)
+ @Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "涓绘暟閲�")
private java.lang.Double mainQuantity;
/**
@@ -103,8 +102,8 @@
/**
* 鍑哄巶鏃ユ湡
- */
- @Excel(name = "鍑哄巶鏃ユ湡", width = 15)
+ **/
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 15,format = "yyyy-MM-dd")
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
private java.util.Date manufactureDate;
@@ -112,8 +111,9 @@
/**
* 渚涘簲鍟唅d
*/
- @Excel(name = "渚涘簲鍟唅d", width = 15)
+ @Excel(name = "渚涘簲鍟�", width = 15)
@ApiModelProperty(value = "渚涘簲鍟唅d")
+ @Dict(dictTable = "mom_base_supplier", dicCode = "id", dicText = "name")
private String supplierId;
--
Gitblit v1.9.3