From faa2a5d8d3cba12ff98c261713bff4d9cea99b79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 17:23:40 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 634b4f7..7a43338 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -157,6 +157,8 @@
waitPakinItemLog: '缁勬嫋鍘嗗彶妗ｆ槑缁�',
task: '浠诲姟宸ヤ綔妗�',
taskItem: '浠诲姟妗ｆ槑缁�',
+ taskLog: '浠诲姟鍘嗗彶妗�',
+ taskItemLog: '浠诲姟鏄庣粏鍘嗗彶妗�',
},
table: {
field: {
@@ -269,7 +271,7 @@
name: "鐗╂枡鍚嶇О",
code: "鐗╂枡缂栫爜",
shipperId: "璐т富鏍囪瘑",
- groupId: "鍒嗙粍鏍囪瘑",
+ groupId: "鐗╂枡鍒嗙粍",
rglarId: "鎵规瑙勫垯鏍囪瘑",
platCode: "ERP缂栫爜",
spec: "瑙勬牸",
@@ -311,9 +313,9 @@
},
warehouseAreas: {
uuid: "鍞竴缂栫爜",
- name: "鍚嶇О",
+ name: "搴撳尯鍚嶇О",
wareId: "鎵�灞炰粨搴�",
- code: "缂栫爜",
+ code: "搴撳尯缂栫爜",
shipperId: "璐т富",
supplierId: "渚涘簲鍟�",
flagMinus: "鍏佽璐熷簱瀛�",
@@ -342,7 +344,7 @@
loc: {
warehouseId: "鎵�灞炰粨搴�",
areaId: "鎵�灞炲簱鍖�",
- code: "缂栫爜",
+ code: "搴撲綅缂栫爜",
type: "搴撲綅绫诲瀷",
name: "鍚嶇О",
flagLogic: "铏氭嫙搴撲綅",
@@ -422,7 +424,7 @@
qlyInspect: {
asnId: "鏀惰揣閫氱煡鍗曞彿",
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
- code: "缂栫爜",
+ code: "璐ㄦ鍗曠紪鐮�",
wkType: "涓氬姟绫诲瀷",
safeQty: "鍚堟牸鏁伴噺",
dlyQty: "閫佽揣鏁伴噺",
@@ -432,7 +434,7 @@
},
qlyIsptItem: {
ispectId: "涓诲崟ID",
- matnrCode: "缂栧彿",
+ matnrCode: "鐗╂枡缂栧彿",
maktx: "鐗╂枡鍚嶇О",
label: "鏍囩",
splrName: "渚涘簲鍟嗗悕绉�",
@@ -445,6 +447,7 @@
disQty: "涓嶅悎鏁伴噺",
safeQty: "鍚堟牸鏁伴噺",
picPath: "鍥剧墖璺緞",
+ trackCode: "鏉″舰鐮�",
},
dictType: {
code: "瀛楀吀缂栫爜",
@@ -520,7 +523,7 @@
poDetlCode: "PO鍗曠紪鐮�",
matnrId: "鐗╂枡鏍囪瘑",
maktx: "鐗╂枡鍚嶇О",
- maktxCode: "鐗╂枡缂栫爜",
+ matnrCode: "鐗╂枡缂栫爜",
anfme: "鏁伴噺",
stockUnit: "搴撳瓨鍗曚綅",
purQty: "璁″垝鏀惰揣鏁伴噺",
@@ -534,7 +537,7 @@
packName: "鍖呰鍚嶇О",
ntyStatus: "鎶ユ鐘舵��",
prodTime: "鐢熶骇鏃ユ湡",
- platItemId: 'PO琛屽彿'
+ platItemId: 'PO鍗曞彿'
},
asnOrderLog: {
code: "缂栫爜",
@@ -554,7 +557,7 @@
asnCode: "涓诲崟缂栫爜",
platItemId: "erp鏍囪瘑",
poDetlId: "PO鍗曟爣璇�",
- poCode: "PO鍗曠紪鐮�",
+ poDetlCode: "PO鍗曠紪鐮�",
fieldsIndex: "瀛楁绱㈠紩",
matnrId: "鐗╂枡鏍囪瘑",
matnrCode: "鐗╂枡缂栫爜",
@@ -606,7 +609,7 @@
fields: {
fields: "瀛楁",
fieldsAlise: "瀛楁鍒悕",
- unique: "绱㈠紩瀛楁",
+ unique: "鏄惁蹇呭～",
flagEnable: "鍚敤",
},
fieldsItem: {
@@ -693,15 +696,50 @@
startTime: "寮�濮嬫椂闂�",
endTime: "缁撴潫鏃堕棿",
},
+ taskLog: {
+ taskId: "浠诲姟ID",
+ taskCode: "浠诲姟鍙�",
+ taskStatus: "鐘舵��",
+ taskType: "绫诲瀷",
+ orgLoc: "婧愬簱浣�",
+ orgSite: "婧愮珯鐐�",
+ targLoc: "鐩爣搴撲綅",
+ targSite: "鐩爣绔欑偣",
+ barcode: "鎷栫洏鐮�",
+ robotCode: "鏈哄櫒缂栫爜",
+ exceStatus: "鎵ц鐘舵��",
+ expDesc: "寮傚父璇存槑",
+ sort: "浼樺厛绾�",
+ expCode: "寮傚父缂栫爜",
+ startTime: "寮�濮嬫椂闂�",
+ endTime: "缁撴潫鏃堕棿",
+ },
taskItem: {
taskId: "taskId",
orderId: "璁㈠崟ID",
orderType: "鍗曟嵁绫诲瀷",
orderItemId: "璁㈠崟鏄庣粏ID",
- sourceCode: "璁㈠崟鍙�",
+ source: "婧怚D",
matnrId: "鐗╂枡ID",
maktx: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
+ unit: "鍗曚綅",
+ anfme: "鏁伴噺",
+ batch: "鎵规",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
+ },
+ taskItemLog: {
+ taskItemId: "taskItemId",
+ taskId: "taskId",
+ orderId: "璁㈠崟ID",
+ orderType: "鍗曟嵁绫诲瀷",
+ orderItemId: "璁㈠崟鏄庣粏ID",
+ source: "婧怚D",
+ matnrId: "鐗╂枡ID",
+ maktx: "鐗╂枡鍚嶇О",
+ matnrCode: "鐗╂枡缂栫爜",
+ trackCode: "璺熻釜鐮�",
unit: "鍗曚綅",
anfme: "鏁伴噺",
batch: "鎵规",
@@ -795,6 +833,9 @@
siteInit: '绔欑偣鍒濆鍖�',
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
+ cancel: "鍙栨秷",
+ top: "缃《",
+ resort: "鎺掑簭",
subzone: '缁戝畾鍒嗗尯',
bindmatnr: '缁戝畾鐗╂枡',
bindloc: '缁戝畾搴撲綅',
@@ -812,6 +853,8 @@
complete: "瀹屾垚",
close: "鍏抽棴",
asnCreate: "閫氳繃ASN鍒涘缓",
+ createTask: "鐢熸垚浠诲姟",
+ recover: "缁х画鏀惰揣",
},
};
--
Gitblit v1.9.1