From 866601517e00f9f4ecf43855f28169c66b548412 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 28 三月 2025 14:19:35 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 96 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 83 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 7008ad7..2562f2e 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -13,8 +13,8 @@
id: 'ID',
uuid: '缂栧彿',
name: '鍚嶇О',
- createTime: '娣诲姞鏃堕棿',
- createBy: '娣诲姞浜哄憳',
+ createTime: '鍒涘缓鏃堕棿',
+ createBy: '鍒涘缓浜哄憳',
updateTime: '淇敼鏃堕棿',
updateBy: '淇敼浜哄憳',
status: '鐘舵��',
@@ -122,12 +122,15 @@
userLogin: '鐧诲綍鏃ュ織',
customer: '瀹㈡埛琛�',
shipper: '璐т富淇℃伅',
- matnr: '鐗╂枡鏁版嵁',
+ matnr: '鐗╂枡',
matnrGroup: '鐗╂枡鍒嗙粍',
- warehouse: '浠撳簱淇℃伅',
- warehouseAreas: '浠撳簱搴撳尯',
- loc: '鍩虹搴撲綅',
+ warehouse: '浠撳簱',
+ warehouseAreas: '搴撳尯',
+ loc: '搴撲綅',
locType: '搴撲綅绫诲瀷',
+ locArea: '閫昏緫鍒嗗尯',
+ locAreaMat: '閫昏緫鍒嗗尯',
+ locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
@@ -144,6 +147,9 @@
fields: '鎵╁睍瀛楁',
fieldsItem: '鎵╁睍瀛楁鏄庣粏',
warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
+ deviceSite: '绔欑偣绠＄悊',
+ waitPakin: 'WaitPakin',
+ waitPakinItem: 'WaitPakinItem',
},
table: {
field: {
@@ -275,14 +281,15 @@
minQty: "鏈�灏忓��",
maxQty: "鏈�澶у��",
stagn: "鍋滄粸棰勮鍊�",
- valid: "淇濊川鏈�",
- validWarn: "鏁堟湡棰勮",
+ valid: "淇濊川鏈�(澶�)",
+ validWarn: "鏁堟湡棰勮(澶�)",
flagCheck: "鍏嶆",
},
matnrGroup: {
name: "鍚嶇О",
code: "缂栫爜",
parentId: "涓婄骇鏍囪瘑",
+ parCode: "涓婄骇缂栫爜",
},
warehouse: {
name: "浠撳簱鍚嶇О",
@@ -298,7 +305,7 @@
warehouseAreas: {
uuid: "鍞竴缂栫爜",
name: "鍚嶇О",
- wareId: "浠撳簱",
+ wareId: "鎵�灞炰粨搴�",
code: "缂栫爜",
shipperId: "璐т富",
supplierId: "渚涘簲鍟�",
@@ -326,8 +333,8 @@
splrBtch: "渚涘簲鍟嗘壒娆�",
},
loc: {
- warehouseId: "浠撳簱",
- areaId: "搴撳尯",
+ warehouseId: "鎵�灞炰粨搴�",
+ areaId: "鎵�灞炲簱鍖�",
code: "缂栫爜",
type: "搴撲綅绫诲瀷",
name: "鍚嶇О",
@@ -354,16 +361,33 @@
startBay: "璧峰鍒�",
startLev: "璧峰灞�",
startRow: "璧峰鎺�",
- useStatus: '搴撲綅鐘舵��'
+ useStatus: '搴撲綅鐘舵��',
+ locAreaId: '閫昏緫鍒嗗尯'
},
locType: {
name: "搴撲綅绫诲瀷",
+ code: "缂栧彿",
regex: "瑙勫垯琛ㄨ揪寮�",
},
locArea: {
name: "鍚嶇О",
code: "缂栫爜",
areaId: "搴撳尯",
+ locId: "搴撲綅",
+ },
+ locAreaMat: {
+ code: "閫昏緫缂栫爜",
+ depict: "閫昏緫鎻忚堪",
+ name: "鍚嶇О",
+ warehouseId: "浠撳簱",
+ areaId: "搴撳尯",
+ },
+ locAreaMatRela: {
+ areaId: "搴撳尯",
+ code: "缂栫爜",
+ matnrId: "鐗╂枡",
+ groupId: "鐗╂枡鍒嗙粍",
+ locTypeId: "搴撲綅绫诲瀷",
locId: "搴撲綅",
},
container: {
@@ -540,6 +564,38 @@
matnrId: "matnrId",
shiperId: "shiperId",
},
+ deviceSite: {
+ type: "鍏ュ嚭搴撶被鍨�",
+ site: "绔欑偣缂栧彿",
+ name: "鍚嶇О",
+ wcsCode: "wcs绔欑偣缂栧彿",
+ label: "绔欑偣鏍囩",
+ device: "璁惧绫诲瀷",
+ deviceCode: "璁惧缂栧彿",
+ deviceSite: "璁惧绔欑偣",
+ flagInit: "鏄惁鍒濆鍖�",
+ sites: "浣滀笟绔欑偣",
+ },
+ waitPakin: {
+ code: "code",
+ ansId: "ansId",
+ asnCode: "asnCode",
+ barcode: "barcode",
+ anfme: "anfme",
+ ioStatus: "ioStatus",
+ },
+ waitPakinItem: {
+ pakinId: "pakinId",
+ maktx: "maktx",
+ matnrId: "matnrId",
+ matnrCode: "matnrCode",
+ anfme: "anfme",
+ workQty: "workQty",
+ unit: "unit",
+ fieldsIndex: "fieldsIndex",
+ qty: "qty",
+ batch: "batch",
+ },
}
},
page: {
@@ -623,8 +679,22 @@
print: "鎵撳嵃",
enable: '鍚敤',
unenable: '绂佺敤',
- locInit: '聽搴撲綅鍒濆鍖�',
+ locInit: '搴撲綅鍒濆鍖�',
+ siteInit: '绔欑偣鍒濆鍖�',
batch: '鎵归噺鎿嶄綔',
+ confirm: '纭',
+ subzone: '缁戝畾鍒嗗尯',
+ bindmatnr: '缁戝畾鐗╂枡',
+ bindloc: '缁戝畾搴撲綅',
+ batchMatnrGropu: '鎵归噺鐗╂枡鍒嗙粍',
+ batchStatus: '鎵归噺鐘舵��',
+ batchMix: '鎵归噺娣锋斁',
+ batchWarehouse: '鎵归噺浠撳簱',
+ batchStockLevel: "鎵归噺ABC鍒嗙被",
+ batchValidWarn: "鎵归噺棰勮",
+ batchFlagCheck: "鎵归噺鍏嶆",
+ batchWarehouseAreas: "鎵归噺搴撳尯",
+ batchLocType: "鎵归噺搴撲綅绫诲瀷",
},
};
--
Gitblit v1.9.1