From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index cd137a4..77bd2ae 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -24,6 +24,10 @@
memoWrap: '鏄剧ず澶囨敞',
memo: '澶囨敞',
opt: '鎿嶄綔',
+ supplier: '渚涘簲鍟�',
+ customer: '瀹㈡埛',
+ shipper: '璐т富',
+ partners: '鎴樼暐鍚堜綔',
},
list: {
empty: {
@@ -347,6 +351,7 @@
flagMix: "娣锋斁",
},
warehouseAreasItem: {
+ asnCode: '鍗曞彿',
areaId: "浠撳簱鍖哄煙",
areaName: "鍖哄煙鍚嶇О ",
matnrId: "鐗╂枡鏍囪瘑",
@@ -356,6 +361,7 @@
workQty: '涓婃灦涓�',
qty: '宸插畬鎴�',
barcode: "鏉″舰鐮�",
+ isptResult: '璐ㄦ鐘舵��',
anfme: "鏁伴噺",
batch: "鎵规鍙�",
unit: "璁￠噺鍗曚綅",
@@ -534,9 +540,9 @@
code: "ASN鍗曞彿",
poCode: "PO缂栫爜",
poId: "PO鏍囪瘑",
- type: "绫诲瀷",
+ type: "鍗曟嵁绫诲瀷",
wkType: "涓氬姟绫诲瀷",
- anfme: "鏁伴噺",
+ anfme: "璁″垝鏁伴噺",
qty: "瀹屾垚鏁伴噺",
logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
@@ -563,24 +569,30 @@
asnCode: "涓诲崟缂栫爜",
poDetlId: "PO鍗旾D",
poDetlCode: "PO鍗�",
+ platItemId: '琛屽彿',
matnrId: "鐗╂枡鏍囪瘑",
maktx: "鐗╂枡鍚嶇О",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
matnrCode: "鐗╂枡缂栫爜",
- anfme: "璁″垝鏀惰揣鏁�",
- stockUnit: "搴撳瓨鍗曚綅",
+ anfme: "璁″垝鏁�",
+ stockUnit: "鍗曚綅",
+ isptResult: "璐ㄦ缁撴灉",
purQty: "閲囪喘閲�",
purUnit: "閲囪喘鍗曚綅",
unit: '鍗曚綅',
- qty: "瀹屾垚鏁伴噺",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ qty: "瀹屾垚鏁�",
+ safeQty: '鍚堟牸鏁�',
+ disQty: '涓嶅悎鏍兼暟',
+ splrBatch: "鎵规",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrName: "渚涘簲鍟嗗悕绉�",
+ splrName: "渚涘簲鍟�",
qrcode: "浜岀淮鐮�",
- barcode: "鏉″舰鐮�",
+ barcode: "搴忓垪鐮�",
+ isptResult: "璐ㄦ鐘舵��",
packName: "鍖呰",
ntyStatus: "鎶ユ鐘舵��",
prodTime: "鐢熶骇鏃ユ湡",
- platItemId: '琛屽彿'
},
outStockItem: {
asnId: "涓诲崟鏍囪瘑",
@@ -611,7 +623,7 @@
poId: "PO鏍囪瘑",
type: "鍗曟嵁绫诲瀷",
wkType: "涓氬姟绫诲瀷",
- anfme: "鏁伴噺",
+ anfme: "璁″垝鏁伴噺",
qty: "宸插畬鎴愭暟閲�",
logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
@@ -744,6 +756,7 @@
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
trackCode: "鏉″舰鐮�",
+ isptResult: '璐ㄦ鐘舵��',
anfme: "鏁伴噺",
workQty: "鎵ц涓暟閲�",
unit: "鍗曚綅",
@@ -845,6 +858,7 @@
source: "婧怚D",
matnrId: "鐗╂枡ID",
maktx: "鐗╂枡鍚嶇О",
+ isptResult: '璐ㄦ鐘舵��',
matnrCode: "鐗╂枡缂栫爜",
unit: "鍗曚綅",
anfme: "鏁伴噺",
@@ -901,13 +915,15 @@
},
locItem: {
locId: "搴撲綅ID",
- locCode: "搴撲綅缂栫爜",
+ locCode: "搴撲綅",
orderId: "璁㈠崟ID",
type: "鍗曟嵁绫诲瀷",
orderItemId: "鍗曟嵁鏄庣粏ID",
wkType: "涓氬姟绫诲瀷",
matnrId: "鐗╂枡ID",
maktx: "鐗╂枡鍚嶇О",
+ unit: '鍗曚綅',
+ anfme: '鏁伴噺',
matnrCode: "鐗╂枡缂栫爜",
trackCode: "璺熻釜鐮�",
workQty: '鎵ц鏁�',
@@ -1039,7 +1055,7 @@
batchLocType: "鎵归噺搴撲綅绫诲瀷",
batchPrint: "鎵归噺鎵撳嵃",
quality: "璐ㄦ",
- complete: "瀹屾垚",
+ complete: "瀹岀粨",
close: "鍏抽棴",
asnCreate: "閫氳繃鍗曟嵁鍒涘缓",
createTask: "涓嬪彂浠诲姟",
@@ -1048,7 +1064,8 @@
},
request: {
error: {
- stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�"
+ stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�",
+ select_error_order: "璇烽�夋嫨閫氱煡鍗�",
}
}
--
Gitblit v1.9.1