From 1de6b39bfe3967916dcab8122be0d69fbaba8cca Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 30 五月 2025 17:29:06 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/i18n/zh.js | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js index 3de4811..94a27e4 100644 --- a/rsf-admin/src/i18n/zh.js +++ b/rsf-admin/src/i18n/zh.js @@ -208,7 +208,8 @@ basContainer: '瀹瑰櫒绠$悊', outBound: '鍑哄簱浣滀笟', checkOutBound: '鐩樼偣鍑哄簱', - stockTransfer: '搴撳瓨杞Щ', + stockTransfer: '搴撲綅杞Щ', + }, table: { field: { @@ -448,7 +449,7 @@ row: "鎺�", col: "鍒�", lev: "灞�", - channel: "閫氶亾", + channel: "宸烽亾", maxParts: "鏈�澶ч浂浠舵暟", maxPack: "鏈�澶у寘瑁呮暟", flagLabelMange: "鏍囩绠$悊", @@ -791,7 +792,7 @@ }, deviceSite: { type: "鍏ュ嚭搴撶被鍨�", - site: "鍏ュ簱鍙�", + site: "浣滀笟绔欑偣", name: "鍚嶇О", target: "鐩爣绔欑偣", label: "绔欑偣鏍囩", @@ -800,6 +801,7 @@ deviceSite: "璁惧绔欑偣", flagInit: "鏄惁鍒濆鍖�", wcsCode: "wcs缂栧彿", + channel: "宸烽亾", }, waitPakin: { code: "缂栫爜", @@ -918,6 +920,7 @@ taskId: "taskId", orderId: "璁㈠崟ID", orderType: "鍗曟嵁绫诲瀷", + wkType: '涓氬姟绫诲瀷', orderItemId: "璁㈠崟鏄庣粏ID", source: "婧怚D", matnrId: "鐗╂枡ID", @@ -1125,6 +1128,7 @@ batch: '鎵归噺鎿嶄綔', confirm: '纭', pick: '鎷f枡', + check: '鐩樼偣', bulkExport: "鎵归噺瀵煎嚭", selectSite: '閫夋嫨绔欑偣', confirmSelect: '纭閫夋嫨', @@ -1161,7 +1165,7 @@ stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�", select_error_order: "璇烽�夋嫨閫氱煡鍗�", out_stock_qty: "鍑哄簱鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺", - + qty_not_negative: "鏁伴噺涓嶈兘灏忎簬绛変簬0", } } -- Gitblit v1.9.1