From ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/i18n/en.js | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 4780e6d..01d776a 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -121,6 +121,8 @@
customer: 'Customer',
shipper: 'shipper',
matnr: 'Matnr',
+ matnrGroup: 'MatnrGroup',
+
},
table: {
field: {
@@ -230,24 +232,31 @@
name: "name",
},
matnr: {
- uuid: "uuid",
- shipperId: "shipperId",
name: "name",
code: "code",
+ shipperId: "shipperId",
groupId: "groupId",
+ batchRegularId: "batchRegularId",
erpCode: "erpCode",
spec: "spec",
model: "model",
weight: "weight",
color: "color",
size: "size",
- desc: "desc",
+ describle: "describle",
nromNum: "nromNum",
unit: "unit",
purchaseUnit: "purchaseUnit",
stockUnit: "stockUnit",
stockLeval: "stockLeval",
isLabelMange: "isLabelMange",
+ safetyQty: "safetyQty",
+ minQty: "minQty",
+ maxQty: "maxQty",
+ stagnate: "stagnate",
+ validity: "validity",
+ validityWarr: "validityWarr",
+ flagCheck: "flagCheck",
},
matnrGroup: {
name: "name",
--
Gitblit v1.9.1