From 1b52ecdf3696746a1b33c66f243bcd2b3b87a531 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 31 八月 2023 09:48:43 +0800
Subject: [PATCH] #物料档案
---
src/main/resources/mapper/MatMapper.xml | 4 +++-
src/main/java/com/zy/asrs/entity/Mat.java | 18 +++++++++++++++++-
src/main/webapp/static/js/common.js | 3 +++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index edeaf84..7a187c2 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -307,9 +307,22 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_max")
+ private Integer inventoryMax;
+
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_min")
+ private Integer inventoryMin;
+
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_age_max")
+ private Integer inventoryAgeMax;
+
+
public Mat() {}
- public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer inventoryMin,Integer inventoryMax,Integer inventoryAgeMax) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -347,6 +360,9 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.inventoryAgeMax = inventoryAgeMax;
+ this.inventoryMax = inventoryMax;
+ this.inventoryMin = inventoryMin;
}
// Mat mat = new Mat(
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 5f89c82..4ba3595 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -42,8 +42,10 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
<result column="stock" property="stock" />
+ <result column="inventory_max" property="inventoryMax" />
+ <result column="inventory_min" property="inventoryMin" />
+ <result column="inventory_age_max" property="inventoryAgeMax" />
</resultMap>
<select id="listByPage" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 850f789..51a77a6 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -235,6 +235,9 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'inventoryMax', align: 'center',title: '搴撳瓨涓婇檺', hide: false}
+ ,{field: 'inventoryMin', align: 'center',title: '搴撳瓨涓嬮檺', hide: false}
+ ,{field: 'inventoryAgeMax', align: 'center',title: '搴撻緞涓婇檺', hide: false}
]
var detlCols = [
--
Gitblit v1.9.1