From fe286cb7f411527b3c1474831fd62c2ac5e3b073 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 09 八月 2024 15:37:45 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java | 25 +++++++++++-
zy-asrs-admin/src/views/base/mat/index.vue | 21 ++++++++++
zy-asrs-admin/src/views/base/mat/edit.vue | 41 +++++++++++++-------
3 files changed, 71 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/mat/edit.vue b/zy-asrs-admin/src/views/base/mat/edit.vue
index 3089870..6b487e9 100644
--- a/zy-asrs-admin/src/views/base/mat/edit.vue
+++ b/zy-asrs-admin/src/views/base/mat/edit.vue
@@ -64,19 +64,19 @@
//鎵╁睍瀛楁
getColumns()
async function getColumns() {
- let fieldResp = await post('/api/matField/list', {
- fieldType: 0
- })
- let fieldResult = fieldResp.data;
- if (fieldResult.code == 200) {
- let data = fieldResult.data;
- extendField.value = data;
- } else if (result.code === 401) {
- message.error(result.msg);
- logout()
- } else {
- message.error(result.msg);
- }
+ let fieldResp = await post('/api/matField/list', {
+ fieldType: 0
+ })
+ let fieldResult = fieldResp.data;
+ if (fieldResult.code == 200) {
+ let data = fieldResult.data;
+ extendField.value = data;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
}
@@ -225,6 +225,18 @@
style="width: 250px;">
<a-input v-model:value="formData.deadTime" />
</a-form-item>
+ <a-form-item :label="formatMessage('db.man_mat.safeStockLimit', '瀹夊叏搴撳瓨涓婇檺')" name="safeStockLimit"
+ style="width: 250px;">
+ <a-input v-model:value="formData.safeStockLimit" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_mat.safeStockMinimum', '瀹夊叏搴撳瓨涓嬮檺')" name="safeStockMinimum"
+ style="width: 250px;">
+ <a-input v-model:value="formData.safeStockMinimum" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_mat.validity', '鏈夋晥鏈�')" name="validity"
+ style="width: 250px;">
+ <a-input v-model:value="formData.validity" />
+ </a-form-item>
<a-form-item :label="formatMessage('db.man_mat.flag', '鏍囪瘑')" name="flag" style="width: 250px;">
<a-input v-model:value="formData.flag" />
</a-form-item>
@@ -242,7 +254,8 @@
<a-input v-model:value="formData.memo" />
</a-form-item>
- <a-form-item v-for="(item, index) in extendField" :key="index" :label="formatMessage(item.language, item.describe)" :name="item.name" style="width: 250px;">
+ <a-form-item v-for="(item, index) in extendField" :key="index"
+ :label="formatMessage(item.language, item.describe)" :name="item.name" style="width: 250px;">
<a-input v-model:value="formData[item.name]" />
</a-form-item>
diff --git a/zy-asrs-admin/src/views/base/mat/index.vue b/zy-asrs-admin/src/views/base/mat/index.vue
index eae728b..47f7cf4 100644
--- a/zy-asrs-admin/src/views/base/mat/index.vue
+++ b/zy-asrs-admin/src/views/base/mat/index.vue
@@ -221,6 +221,27 @@
ellipsis: true,
...getColumnSearchProps('deadTime'),
},
+ {
+ title: formatMessage('db.man_mat.safeStockLimit', '瀹夊叏搴撳瓨涓婇檺'),
+ dataIndex: 'safeStockLimit',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('safeStockLimit'),
+ },
+ {
+ title: formatMessage('db.man_mat.safeStockMinimum', '瀹夊叏搴撳瓨涓嬮檺'),
+ dataIndex: 'safeStockMinimum',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('safeStockMinimum'),
+ },
+ {
+ title: formatMessage('db.man_mat.validity', '鏈夋晥鏈�'),
+ dataIndex: 'validity',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('validity'),
+ },
{
title: formatMessage('db.man_mat.uuid', '缂栧彿'),
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
index becd51d..e69f3d6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
@@ -249,9 +249,27 @@
@ApiModelProperty(value= "淇濊川鏈�")
private String deadTime;
+ /**
+ * 瀹夊叏搴撳瓨涓婇檺
+ */
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨涓婇檺")
+ private Double safeStockLimit;
+
+ /**
+ * 瀹夊叏搴撳瓨涓嬮檺
+ */
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨涓嬮檺")
+ private Double safeStockMinimum;
+
+ /**
+ * 鏈夋晥鏈�
+ */
+ @ApiModelProperty(value= "鏈夋晥鏈�")
+ private String validity;
+
public Mat() {}
- public Mat(String uuid,String flag,Integer sort,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,String units,String barcode,String origin,String manu,String manuDate,String itemNum,String weight,String length,String volume,String threeCode,String supp,String suppCode,String deadTime) {
+ public Mat(String uuid, String flag, Integer sort, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, String weight, String length, String volume, String threeCode, String supp, String suppCode, String deadTime, Double safeStockLimit, Double safeStockMinimum, String validity) {
this.uuid = uuid;
this.flag = flag;
this.sort = sort;
@@ -287,9 +305,12 @@
this.supp = supp;
this.suppCode = suppCode;
this.deadTime = deadTime;
+ this.safeStockLimit = safeStockLimit;
+ this.safeStockMinimum = safeStockMinimum;
+ this.validity = validity;
}
-// Mat mat = new Mat(
+ // Mat mat = new Mat(
// null, // 缂栧彿
// null, // 鏍囪瘑
// null, // 鎺掑簭
--
Gitblit v1.9.1