From 351b16d0a3dc194841c2192cacfabf788ecafd5c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 05 八月 2024 08:19:17 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/components/orderDetlLog/edit.vue | 4 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java | 10 ++--
zy-asrs-admin/src/components/orderDetlLog/show.vue | 4 +-
zy-asrs-admin/src/components/taskLog/showTaskDetlLog/index.vue | 4 +-
zy-asrs-admin/src/views/in/waitPakin/index.vue | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java | 10 ++--
zy-asrs-admin/src/components/order/waitTask/index.vue | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java | 4 +-
zy-asrs-admin/src/components/orderDetl/edit.vue | 4 +-
zy-asrs-admin/src/components/orderDetl/show.vue | 4 +-
zy-asrs-admin/src/components/task/showTaskDetl/index.vue | 4 +-
zy-asrs-admin/src/views/loc/locDetl/index.vue | 4 +-
zy-asrs-admin/src/views/loc/locDetl/edit.vue | 4 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java | 4 +-
zy-asrs-admin/src/components/locDetl/show.vue | 4 +-
zy-asrs-admin/src/views/in/waitPakinLog/index.vue | 2
16 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/zy-asrs-admin/src/components/locDetl/show.vue b/zy-asrs-admin/src/components/locDetl/show.vue
index 2e62085..bfbb01e 100644
--- a/zy-asrs-admin/src/components/locDetl/show.vue
+++ b/zy-asrs-admin/src/components/locDetl/show.vue
@@ -37,14 +37,14 @@
...getColumnSearchProps('locNo'),
},
{
- title: formatMessage('db.man_loc_detl.mat_id', '鐗╂枡'),
+ title: formatMessage('db.man_loc_detl.mat_id', '鍟嗗搧'),
dataIndex: 'matId$',
width: 140,
ellipsis: true,
...getColumnSearchProps('matId$'),
},
{
- title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/components/order/waitTask/index.vue b/zy-asrs-admin/src/components/order/waitTask/index.vue
index 4c47ea5..575229a 100644
--- a/zy-asrs-admin/src/components/order/waitTask/index.vue
+++ b/zy-asrs-admin/src/components/order/waitTask/index.vue
@@ -51,7 +51,7 @@
...getColumnSearchProps('barcode'),
},
{
- title: formatMessage('db.man_wait_pakin.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_wait_pakin.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['detl$', 'mat$', 'matnr'],
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/components/orderDetl/edit.vue b/zy-asrs-admin/src/components/orderDetl/edit.vue
index 5439b8a..f2584d3 100644
--- a/zy-asrs-admin/src/components/orderDetl/edit.vue
+++ b/zy-asrs-admin/src/components/orderDetl/edit.vue
@@ -35,13 +35,13 @@
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.maktx', '鐗╂枡鍚�'),
+ title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: 'maktx',
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index 78527e2..84acf33 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -48,13 +48,13 @@
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.maktx', '鐗╂枡鍚�'),
+ title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: 'maktx',
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/components/orderDetlLog/edit.vue b/zy-asrs-admin/src/components/orderDetlLog/edit.vue
index 5439b8a..f2584d3 100644
--- a/zy-asrs-admin/src/components/orderDetlLog/edit.vue
+++ b/zy-asrs-admin/src/components/orderDetlLog/edit.vue
@@ -35,13 +35,13 @@
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.maktx', '鐗╂枡鍚�'),
+ title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: 'maktx',
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/components/orderDetlLog/show.vue b/zy-asrs-admin/src/components/orderDetlLog/show.vue
index 0c0147b..98dc30f 100644
--- a/zy-asrs-admin/src/components/orderDetlLog/show.vue
+++ b/zy-asrs-admin/src/components/orderDetlLog/show.vue
@@ -42,13 +42,13 @@
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
},
{
- title: formatMessage('db.man_loc_detl.maktx', '鐗╂枡鍚�'),
+ title: formatMessage('db.man_loc_detl.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: 'maktx',
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/components/task/showTaskDetl/index.vue b/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
index 64b3225..59b579a 100644
--- a/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
+++ b/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
@@ -51,13 +51,13 @@
...getColumnSearchProps('taskNo'),
},
{
- title: formatMessage('db.man_task_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_task_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['mat$', 'matnr'],
width: 140,
ellipsis: true,
},
{
- title: formatMessage('db.man_task_detl.maktx', '鐗╂枡鍚�'),
+ title: formatMessage('db.man_task_detl.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: ['mat$', 'maktx'],
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/components/taskLog/showTaskDetlLog/index.vue b/zy-asrs-admin/src/components/taskLog/showTaskDetlLog/index.vue
index 2cfde6c..5e0c55f 100644
--- a/zy-asrs-admin/src/components/taskLog/showTaskDetlLog/index.vue
+++ b/zy-asrs-admin/src/components/taskLog/showTaskDetlLog/index.vue
@@ -51,13 +51,13 @@
...getColumnSearchProps('taskNo'),
},
{
- title: formatMessage('db.man_task_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_task_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['mat$', 'matnr'],
width: 140,
ellipsis: true,
},
{
- title: formatMessage('db.man_task_detl.maktx', '鐗╂枡鍚�'),
+ title: formatMessage('db.man_task_detl.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: ['mat$', 'maktx'],
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/views/in/waitPakin/index.vue b/zy-asrs-admin/src/views/in/waitPakin/index.vue
index 24a1feb..1b736df 100644
--- a/zy-asrs-admin/src/views/in/waitPakin/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakin/index.vue
@@ -57,7 +57,7 @@
...getColumnSearchProps('barcode'),
},
{
- title: formatMessage('db.man_wait_pakin.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_wait_pakin.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['detl$', 'mat$', 'matnr'],
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/views/in/waitPakinLog/index.vue b/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
index 9bfe4f9..4ab62d4 100644
--- a/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
@@ -55,7 +55,7 @@
...getColumnSearchProps('barcode'),
},
{
- title: formatMessage('db.man_wait_pakin_log.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_wait_pakin_log.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['detl$', 'mat$', 'matnr'],
width: 140,
ellipsis: true,
diff --git a/zy-asrs-admin/src/views/loc/locDetl/edit.vue b/zy-asrs-admin/src/views/loc/locDetl/edit.vue
index cf6ed83..544d1c5 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/edit.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/edit.vue
@@ -118,13 +118,13 @@
:rules="[{ required: true }]">
<a-input v-model:value="formData.locNo" />
</a-form-item>
- <a-form-item :label="formatMessage('db.man_loc_detl.mat_id', '鐗╂枡')" name="matId" style="width: 250px;">
+ <a-form-item :label="formatMessage('db.man_loc_detl.mat_id', '鍟嗗搧')" name="matId" style="width: 250px;">
<a-select v-model:value="formData.matId" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
style="width: 100%" show-search :options="matQueryList" optionFilterProp="label"
optionLabelProp="label">
</a-select>
</a-form-item>
- <a-form-item :label="formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�')" name="matnr" style="width: 250px;">
+ <a-form-item :label="formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿')" name="matnr" style="width: 250px;">
<a-input v-model:value="formData.matnr" />
</a-form-item>
<a-form-item :label="formatMessage('db.man_loc_detl.order_no', '璁㈠崟鍙�')" name="orderNo"
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 7171860..df7c012 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -61,14 +61,14 @@
...getColumnSearchProps('locNo'),
},
{
- title: formatMessage('db.man_loc_detl.mat_id', '鐗╂枡'),
+ title: formatMessage('db.man_loc_detl.mat_id', '鍟嗗搧'),
dataIndex: 'matId$',
width: 140,
ellipsis: true,
...getColumnSearchProps('matId$'),
},
{
- title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
+ title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
index 76ca46e..7472fb6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
@@ -57,15 +57,15 @@
private String locNo;
/**
- * 鐗╂枡
+ * 鍟嗗搧
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧")
private Long matId;
/**
- * 鐗╂枡鍙�
+ * 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
@@ -161,7 +161,7 @@
// null, // 搴撲綅
// null, // 搴撲綅鍙穂闈炵┖]
// null, // 鐗╂枡
-// null, // 鐗╂枡鍙�
+// null, // 鍟嗗搧缂栧彿
// null, // 璁㈠崟鍙�
// null, // 鎵瑰彿
// null, // 鏁伴噺
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
index f426325..54a42a0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
@@ -49,15 +49,15 @@
private String locNo;
/**
- * 鐗╂枡
+ * 鍟嗗搧
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧")
private Long matId;
/**
- * 鐗╂枡鍙�
+ * 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
@@ -153,7 +153,7 @@
// null, // 搴撲綅
// null, // 搴撲綅鍙穂闈炵┖]
// null, // 鐗╂枡
-// null, // 鐗╂枡鍙�
+// null, // 鍟嗗搧缂栧彿
// null, // 璁㈠崟鍙�
// null, // 鎵瑰彿
// null, // 鏁伴噺
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java
index 2c39b94..7876a3d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java
@@ -21,8 +21,8 @@
@ApiModelProperty(value= "鍗曟嵁绫诲瀷")
private String orderType;
- //鐗╂枡鍙�
- @ApiModelProperty(value= "鐗╂枡鍙�")
+ //鍟嗗搧缂栧彿
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
//鎵瑰彿
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java
index 754945d..aa343d1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/WaitPakinTemplate.java
@@ -15,8 +15,8 @@
@ApiModelProperty(value= "鎵樼洏鐮�")
private String barcode;
- //鐗╂枡鍙�
- @ApiModelProperty(value= "鐗╂枡鍙�")
+ //鍟嗗搧缂栧彿
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
//鎵瑰彿
--
Gitblit v1.9.1