From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 73 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 6b14606..b98d8cf 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -213,7 +213,7 @@
checkOutBound: '鐩樼偣鍑哄簱',
stockTransfer: '搴撲綅杞Щ',
waveRule: '娉㈡绛栫暐',
-
+ checkOrder: '鐩樼偣鍗�',
},
table: {
field: {
@@ -348,6 +348,7 @@
err: "閿欒淇℃伅",
result: "result",
userId: "鎿嶄綔鐢ㄦ埛",
+ detail: "璇︾粏淇℃伅"
},
customer: {
uuid: "缂栧彿",
@@ -434,7 +435,7 @@
splrId: "渚涘簲鍟嗘爣璇�",
weight: "鏀惰揣閲嶉噺",
prodTime: "鐢熶骇鏃ユ湡",
- splrBtch: "渚涘簲鍟嗘壒娆�",
+ splrBtch: "鎵规",
},
loc: {
warehouseId: "鎵�灞炰粨搴�",
@@ -631,9 +632,47 @@
ntyStatus: "涓婃姤鐘舵��",
exceStatus: '鍗曟嵁鐘舵��'
},
+ checkOrder: {
+ code: "鐩樼偣鍗曞彿",
+ poCode: "DO鍗曞彿",
+ poId: "DO鏍囪瘑",
+ type: "鍗曟嵁绫诲瀷",
+ checkType: '鐩樼偣绫诲瀷',
+ wkType: "涓氬姟绫诲瀷",
+ anfme: "鏁伴噺",
+ workQty: '鎵ц鏁�',
+ qty: "瀹屾垚鏁�",
+ logisNo: "鐗╂祦鍗曞彿",
+ arrTime: "棰勮鍒拌揪鏃堕棿",
+ rleStatus: "閲婃斁鐘舵��",
+ ntyStatus: "涓婃姤鐘舵��",
+ exceStatus: '鎵ц鐘舵��'
+ },
+ checkOrderItem: {
+ orderId: "涓诲崟鏍囪瘑",
+ orderCode: "鍗曞彿",
+ matnrId: "鐗╂枡鏍囪瘑",
+ platOrderCode: '瀹㈡埛鍗曞彿',
+ platWorkCode: '宸ュ崟鍙�',
+ projectCode: '椤圭洰鍙�',
+ maktx: "鐗╂枡鍚嶇О",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
+ matnrCode: "鐗╂枡缂栫爜",
+ anfme: "璁″垝鐩樼偣鏁�",
+ stockUnit: "鍗曚綅",
+ unit: '鍗曚綅',
+ workQty: '宸蹭笅鍙�',
+ qty: "宸茬洏鐐�",
+ splrBatch: "鎵规",
+ splrCode: "渚涘簲鍟嗙紪鐮�",
+ splrName: "渚涘簲鍟�",
+ qrcode: "浜岀淮鐮�",
+ barcode: "搴忓垪鐮�",
+ },
asnOrderItem: {
- asnId: "涓诲崟鏍囪瘑",
- asnCode: "鍗曞彿",
+ orderId: "涓诲崟鏍囪瘑",
+ orderCode: "鍗曞彿",
poDetlId: "PO鍗旾D",
poDetlCode: "PO鍗�",
platItemId: '琛屽彿',
@@ -665,8 +704,8 @@
prodTime: "鐢熶骇鏃ユ湡",
},
outStockItem: {
- asnId: "涓诲崟鏍囪瘑",
- asnCode: "鍗曞彿",
+ orderId: "涓诲崟鏍囪瘑",
+ orderCode: "鍗曞彿",
poCode: 'DO鍗曞彿',
poDetlId: "骞冲彴鏄庣粏ID",
poDetlCode: "DO鍗�",
@@ -680,7 +719,7 @@
purQty: "涓嬪崟鏁伴噺",
purUnit: "鍗曚綅",
qty: "瀹屾垚鏁伴噺",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
splrCode: "渚涘簲鍟嗙紪鐮�",
splrName: "渚涘簲鍟嗗悕绉�",
qrcode: "浜岀淮鐮�",
@@ -704,8 +743,8 @@
ntyStatus: "璐ㄦ涓婃姤鐘舵��",
},
asnOrderItemLog: {
- asnId: "涓诲崟鏍囪瘑",
- asnCode: "涓诲崟缂栫爜",
+ orderId: "涓诲崟鏍囪瘑",
+ orderCode: "涓诲崟缂栫爜",
platItemId: "erp鏍囪瘑",
poDetlId: "PO鍗曟爣璇�",
poDetlCode: "PO鍗曠紪鐮�",
@@ -718,7 +757,7 @@
purUnit: "閲囪喘鍗曚綅",
qty: "宸插畬鎴愭暟閲�",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
splrName: "渚涘簲鍟嗗悕绉�",
qrcode: "浜岀淮鐮�",
trackCode: "鏉″舰鐮�",
@@ -770,7 +809,7 @@
printQty: "鎵撳嵃鏁伴噺",
splrName: "渚涘簲鍟嗗悕绉�",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
},
purchaseItem: {
purchaseId: "PO涓诲崟鏍囪瘑",
@@ -785,7 +824,7 @@
printQty: "鎵撳嵃鏁伴噺",
splrName: "渚涘簲鍟嗗悕绉�",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
},
fields: {
fields: "瀛楁",
@@ -866,11 +905,12 @@
wave: {
code: "娉㈡鍙�",
type: "鍗曟嵁绫诲瀷",
- exceStatus: "鐘舵��",
+ exceStatus: "鎵ц鐘舵��",
anfme: "鏁伴噺",
groupQty: '鍝佺被鏁�',
qty: "瀹屾垚鏁伴噺",
orderNum: "鍗曟嵁鏁�",
+ progress: "杩涘害"
},
waveItem: {
waveId: "娉㈡ID",
@@ -879,7 +919,7 @@
matnrName: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
batch: "鎵规",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
orderCode: "婧愬崟鍙�",
orderItemId: "婧愬崟鏄庣粏ID",
unit: "鍗曚綅",
@@ -985,7 +1025,7 @@
qty: "鎬绘暟",
splrCode: "渚涘簲鍟嗙紪鐮�",
batch: "鎵规",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
splrName: "渚涘簲鍟嗗悕绉�",
trackCode: "璺熻釜鐮�",
barcode: "鏉″舰鐮�",
@@ -1010,7 +1050,7 @@
workQty: '鎵ц鏁�',
qty: '瀹屾垚鏁�',
batch: "鎵规",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
spec: "瑙勬牸",
model: "鍨嬪彿",
fieldsIndex: "鍔ㄦ�佺储寮�",
@@ -1144,6 +1184,7 @@
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
start: '鑷姩涓嬪彂',
+ stopPub: '缁堟涓嬪彂',
pause: '鏆傚仠',
pick: '鎷ｆ枡',
check: '鐩樼偣',
--
Gitblit v1.9.1