From 91e70d462b00475b70edd42e84d3c257bc898b2c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 15:26:56 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 2f2f96b..6e7ede8 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -129,6 +129,8 @@
loc: '搴撲綅',
locType: '搴撲綅绫诲瀷',
locArea: '閫昏緫鍒嗗尯',
+ locAreaMat: '閫昏緫鍒嗗尯',
+ locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
@@ -284,6 +286,7 @@
name: "鍚嶇О",
code: "缂栫爜",
parentId: "涓婄骇鏍囪瘑",
+ parCode: "涓婄骇缂栫爜",
},
warehouse: {
name: "浠撳簱鍚嶇О",
@@ -299,7 +302,7 @@
warehouseAreas: {
uuid: "鍞竴缂栫爜",
name: "鍚嶇О",
- wareId: "浠撳簱",
+ wareId: "鎵�灞炰粨搴�",
code: "缂栫爜",
shipperId: "璐т富",
supplierId: "渚涘簲鍟�",
@@ -327,8 +330,8 @@
splrBtch: "渚涘簲鍟嗘壒娆�",
},
loc: {
- warehouseId: "浠撳簱",
- areaId: "搴撳尯",
+ warehouseId: "鎵�灞炰粨搴�",
+ areaId: "鎵�灞炲簱鍖�",
code: "缂栫爜",
type: "搴撲綅绫诲瀷",
name: "鍚嶇О",
@@ -367,6 +370,18 @@
name: "鍚嶇О",
code: "缂栫爜",
areaId: "搴撳尯",
+ locId: "搴撲綅",
+ },
+ locAreaMat: {
+ code: "閫昏緫缂栫爜",
+ depict: "閫昏緫鎻忚堪",
+ },
+ locAreaMatRela: {
+ areaId: "搴撳尯",
+ code: "缂栫爜",
+ matnrId: "鐗╂枡",
+ groupId: "鐗╂枡鍒嗙粍",
+ locTypeId: "搴撲綅绫诲瀷",
locId: "搴撲綅",
},
container: {
@@ -629,7 +644,13 @@
locInit: '聽搴撲綅鍒濆鍖�',
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
- subzone: '缁戝畾鍒嗗尯'
+ subzone: '缁戝畾鍒嗗尯',
+ bindmatnr: '缁戝畾鐗╂枡',
+ bindloc: '缁戝畾搴撲綅',
+ batchMatnrGropu: '鎵归噺鐗╂枡鍒嗙粍',
+ batchStatus: '鎵归噺鐘舵��',
+ batchMix: '鎵归噺娣锋斁',
+ batchWarehouse: '鎵归噺浠撳簱',
},
};
--
Gitblit v1.9.1