From d248f83e1a47b2ae25acc46233afbafa353bcfe8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 19:00:16 +0800
Subject: [PATCH] 修复框架Sql过滤问题 修复规则编码添加子列表错误问题
---
rsf-admin/src/i18n/zh.js | 321 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 273 insertions(+), 48 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 0f284aa..32fb483 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -9,6 +9,9 @@
fail: "鏈嶅姟鍣ㄩ敊璇�",
dataError: "鏁版嵁閿欒锛岃浠旂粏妫�鏌�",
},
+ button: {
+ edit: "缂栬緫",
+ },
field: {
id: 'ID',
uuid: '缂栧彿',
@@ -134,6 +137,7 @@
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
+ qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: '鏁版嵁瀛楀吀',
dictData: '瀛楀吀鏁版嵁闆�',
companys: '寰�鏉ヤ紒涓�',
@@ -141,6 +145,8 @@
serialRule: '缂栫爜瑙勫垯',
asnOrder: '鏀惰揣閫氱煡鍗�',
asnOrderItem: '鏀惰揣鏄庣粏',
+ asnOrderLog: '鏀惰揣鍘嗗彶鍗�',
+ asnOrderItemLog: '鏀惰揣鍘嗗彶鏄庣粏',
purchase: 'PO鍗�',
purchaseItem: 'PO鍗曟槑缁�',
whMat: '搴撳尯鐗╂枡鍏崇郴',
@@ -148,8 +154,23 @@
fieldsItem: '鎵╁睍瀛楁鏄庣粏',
warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
deviceSite: '绔欑偣绠＄悊',
- waitPakin: 'WaitPakin',
- waitPakinItem: 'WaitPakinItem',
+ waitPakin: '缁勬嫋閫氱煡妗�',
+ waitPakinItem: '缁勬嫋妗ｆ槑缁�',
+ waitPakinLog: '缁勬嫋鍘嗗彶妗�',
+ waitPakinItemLog: '缁勬嫋鍘嗗彶妗ｆ槑缁�',
+ task: '浠诲姟宸ヤ綔妗�',
+ taskItem: '浠诲姟妗ｆ槑缁�',
+ taskLog: '浠诲姟鍘嗗彶妗�',
+ taskItemLog: '浠诲姟鏄庣粏鍘嗗彶妗�',
+ stock: '缁煎悎鍗曟嵁绠＄悊',
+ stockItem: '鍗曟嵁鏄庣粏',
+ locItem: '搴撲綅鏄庣粏',
+ histories: '鍘嗗彶妗�',
+ wareWork: '浠撳簱浣滀笟',
+ statistics: '缁熻鏌ヨ',
+ logs: '鏃ュ織',
+ permissions: '鏉冮檺绠＄悊',
+
},
table: {
field: {
@@ -262,7 +283,7 @@
name: "鐗╂枡鍚嶇О",
code: "鐗╂枡缂栫爜",
shipperId: "璐т富鏍囪瘑",
- groupId: "鍒嗙粍鏍囪瘑",
+ groupId: "鐗╂枡鍒嗙粍",
rglarId: "鎵规瑙勫垯鏍囪瘑",
platCode: "ERP缂栫爜",
spec: "瑙勬牸",
@@ -304,9 +325,9 @@
},
warehouseAreas: {
uuid: "鍞竴缂栫爜",
- name: "鍚嶇О",
+ name: "搴撳尯鍚嶇О",
wareId: "鎵�灞炰粨搴�",
- code: "缂栫爜",
+ code: "搴撳尯缂栫爜",
shipperId: "璐т富",
supplierId: "渚涘簲鍟�",
flagMinus: "鍏佽璐熷簱瀛�",
@@ -335,7 +356,7 @@
loc: {
warehouseId: "鎵�灞炰粨搴�",
areaId: "鎵�灞炲簱鍖�",
- code: "缂栫爜",
+ code: "搴撲綅缂栫爜",
type: "搴撲綅绫诲瀷",
name: "鍚嶇О",
flagLogic: "铏氭嫙搴撲綅",
@@ -413,26 +434,33 @@
projectName: "椤圭洰鍚嶇О",
},
qlyInspect: {
- code: "缂栫爜",
- wkType: "wkType",
+ asnId: "鏀惰揣閫氱煡鍗曞彿",
+ asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+ code: "璐ㄦ鍗曠紪鐮�",
+ wkType: "涓氬姟绫诲瀷",
safeQty: "鍚堟牸鏁伴噺",
- dlyQty: "dlyQty",
- rcptQty: "rcptQty",
- isptQty: "isptQty",
+ dlyQty: "閫佽揣鏁伴噺",
+ rcptQty: "鏀惰揣鏁伴噺 ",
+ isptQty: "璐ㄦ鏁伴噺",
+ isptResult: "璐ㄦ缁撴灉",
+ isptStatus: "璐ㄦ鐘舵��",
},
qlyIsptItem: {
- ispectId: "ispectId",
- matnrCode: "matnrCode",
- maktx: "maktx",
- label: "label",
- splrName: "splrName",
- splrBatch: "splrBatch",
- stockBatch: "stockBatch",
- rcptQty: "rcptQty",
- dlyQty: "dlyQty",
- disQty: "disQty",
- safeQty: "safeQty",
- picPath: "picPath",
+ ispectId: "涓诲崟ID",
+ matnrCode: "鐗╂枡缂栧彿",
+ maktx: "鐗╂枡鍚嶇О",
+ label: "鏍囩",
+ splrName: "渚涘簲鍟嗗悕绉�",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
+ stockBatch: "搴撳瓨鎵规",
+ isptResult: '璐ㄦ缁撹',
+ isptStatus: '璐ㄦ鐘舵��',
+ rcptQty: "鏀惰揣鏁伴噺",
+ dlyQty: "閫佽揣鏁伴噺",
+ disQty: "涓嶅悎鏁伴噺",
+ safeQty: "鍚堟牸鏁伴噺",
+ picPath: "鍥剧墖璺緞",
+ trackCode: "鏉″舰鐮�",
},
dictType: {
code: "瀛楀吀缂栫爜",
@@ -463,8 +491,8 @@
},
serialRuleItem: {
ruleId: "瑙勫垯鏍囪瘑",
- wkType: "瑙勫垯绫诲瀷",
- feildValue: "瑙勫垯鍙傛暟",
+ wkType: "绫诲瀷",
+ feildValue: "绫诲瀷鍙傛暟",
len: "鎴彇闀垮害",
lenStr: "鎴彇璧峰浣嶇疆",
sort: "鎺掑簭",
@@ -489,6 +517,43 @@
maxWeight: "鏈�澶ч噸閲�",
},
asnOrder: {
+ code: "ASN鍗曞彿",
+ poCode: "PO缂栫爜",
+ poId: "PO鏍囪瘑",
+ type: "绫诲瀷",
+ wkType: "涓氬姟绫诲瀷",
+ anfme: "鏁伴噺",
+ qty: "瀹屾垚鏁伴噺",
+ logisNo: "鐗╂祦鍗曞彿",
+ arrTime: "棰勮鍒拌揪鏃堕棿",
+ rleStatus: "閲婃斁鐘舵��",
+ ntyStatus: "涓婃姤鐘舵��",
+ exceStatus: '鍗曟嵁鐘舵��'
+ },
+ asnOrderItem: {
+ asnId: "涓诲崟鏍囪瘑",
+ asnCode: "涓诲崟缂栫爜",
+ poDetlId: "PO鍗旾D",
+ poDetlCode: "PO鍗�",
+ matnrId: "鐗╂枡鏍囪瘑",
+ maktx: "鐗╂枡鍚嶇О",
+ matnrCode: "鐗╂枡缂栫爜",
+ anfme: "璁″垝鏀惰揣鏁�",
+ stockUnit: "搴撳瓨鍗曚綅",
+ purQty: "閲囪喘閲�",
+ purUnit: "閲囪喘鍗曚綅",
+ qty: "瀹屾垚鏁伴噺",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrCode: "渚涘簲鍟嗙紪鐮�",
+ splrName: "渚涘簲鍟嗗悕绉�",
+ qrcode: "浜岀淮鐮�",
+ barcode: "鏉″舰鐮�",
+ packName: "鍖呰",
+ ntyStatus: "鎶ユ鐘舵��",
+ prodTime: "鐢熶骇鏃ユ湡",
+ platItemId: '琛屽彿'
+ },
+ asnOrderLog: {
code: "缂栫爜",
poCode: "PO缂栫爜",
poId: "PO鏍囪瘑",
@@ -501,21 +566,25 @@
rleStatus: "閲婃斁鐘舵��",
ntyStatus: "璐ㄦ涓婃姤鐘舵��",
},
- asnOrderItem: {
+ asnOrderItemLog: {
asnId: "涓诲崟鏍囪瘑",
asnCode: "涓诲崟缂栫爜",
+ platItemId: "erp鏍囪瘑",
poDetlId: "PO鍗曟爣璇�",
poDetlCode: "PO鍗曠紪鐮�",
+ fieldsIndex: "瀛楁绱㈠紩",
matnrId: "鐗╂枡鏍囪瘑",
- maktx: "鐗╂枡鍚嶇О",
- anfme: "鏁伴噺",
- stockUnit: "搴撳瓨鍗曚綅",
+ matnrCode: "鐗╂枡缂栫爜",
+ maktx: "鐗╂枡",
+ anfme: "璁″垝鏁伴噺",
purQty: "閲囪喘鏁伴噺",
purUnit: "閲囪喘鍗曚綅",
qty: "宸插畬鎴愭暟閲�",
splrCode: "渚涘簲鍟嗙紪鐮�",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
splrName: "渚涘簲鍟嗗悕绉�",
qrcode: "浜岀淮鐮�",
+ trackCode: "鏉″舰鐮�",
barcode: "鏉″舰鐮�",
packName: "鍖呰鍚嶇О",
ntyStatus: "鎶ユ鐘舵��",
@@ -554,7 +623,7 @@
fields: {
fields: "瀛楁",
fieldsAlise: "瀛楁鍒悕",
- unique: "绱㈠紩瀛楁",
+ unique: "鏄惁蹇呭～",
flagEnable: "鍚敤",
},
fieldsItem: {
@@ -570,31 +639,175 @@
name: "鍚嶇О",
wcsCode: "wcs绔欑偣缂栧彿",
label: "绔欑偣鏍囩",
- device: "璁惧绫诲瀷",
+ device: "绔嬪簱绫诲瀷",
deviceCode: "璁惧缂栧彿",
deviceSite: "璁惧绔欑偣",
- flagInitu: "鏄惁鍒濆鍖�",
+ flagInit: "鏄惁鍒濆鍖�",
sites: "浣滀笟绔欑偣",
},
waitPakin: {
- code: "code",
- ansId: "ansId",
- asnCode: "asnCode",
- barcode: "barcode",
- anfme: "anfme",
- ioStatus: "ioStatus",
+ code: "缂栫爜",
+ ansId: "鏀惰揣閫氱煡鍗曞彿",
+ asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+ barcode: "瀹瑰櫒鐮�",
+ flagDefect: "涓嶈壇鍝�",
+ anfme: "鏁伴噺",
+ ioStatus: "鐘舵��",
},
waitPakinItem: {
- pakinId: "pakinId",
- maktx: "maktx",
- matnrId: "matnrId",
- matnrCode: "matnrCode",
- anfme: "anfme",
- workQty: "workQty",
- unit: "unit",
- fieldsIndex: "fieldsIndex",
- qty: "qty",
- batch: "batch",
+ pakinId: "缁勬墭Id",
+ maktx: "鐗╂枡",
+ matnrId: "鐗╂枡id",
+ matnrCode: "鐗╂枡缂栫爜",
+ asnId: "鏀惰揣閫氱煡鍗曞彿",
+ asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+ asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
+ trackCode: "鏉″舰鐮�",
+ anfme: "鏁伴噺",
+ workQty: "鎵ц涓暟閲�",
+ unit: "鍗曚綅",
+ fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+ qty: "宸插畬鎴�",
+ batch: "鎵规",
+ },
+ waitPakinLog: {
+ pakinId: "缁勬墭Id",
+ code: "缂栫爜",
+ barcode: "瀹瑰櫒鐮�",
+ anfme: "鏁伴噺",
+ ioStatus: "鐘舵��",
+ },
+ waitPakinItemLog: {
+ pakinId: "缁勬墭Id",
+ pakinItemId: "缁勬墭鏄庣粏Id",
+ asnId: "鏀惰揣閫氱煡鍗曞彿",
+ asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+ asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
+ trackCode: "鏉″舰鐮�",
+ maktx: "鐗╂枡",
+ matnrId: "鐗╂枡id",
+ matnrCode: "鐗╂枡缂栫爜",
+ anfme: "鏁伴噺",
+ workQty: "鎵ц涓暟閲�",
+ unit: "鍗曚綅",
+ fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+ qty: "宸插畬鎴�",
+ batch: "鎵规",
+ },
+ task: {
+ taskCode: "浠诲姟鍙�",
+ taskStatus: "鐘舵��",
+ taskType: "绫诲瀷",
+ orgLoc: "婧愬簱浣�",
+ orgSite: "婧愮珯鐐�",
+ targLoc: "鐩爣搴撲綅",
+ targSite: "鐩爣绔欑偣",
+ barcode: "鎷栫洏鐮�",
+ robotCode: "鏈哄櫒缂栫爜",
+ exceStatus: "鎵ц鐘舵��",
+ expDesc: "寮傚父璇存槑",
+ sort: "浼樺厛绾�",
+ expCode: "寮傚父缂栫爜",
+ 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",
+ 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: "鎵规",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
+ },
+ stock: {
+ code: "缂栫爜",
+ sourceCode: "婧愬崟鎹�",
+ sourceId: "婧愬崟鎹甀D",
+ type: "鍗曟嵁绫诲瀷",
+ wkType: "涓氬姟绫诲瀷",
+ anfme: "鏁伴噺",
+ },
+ stockItem: {
+ orderId: "涓诲崟ID",
+ orderCode: "鍗曟嵁缂栫爜",
+ sourceItemId: "婧愭槑缁咺D",
+ matnrId: "鐗╂枡ID",
+ matnrCode: "鐗╂枡缂栫爜",
+ maktx: "鐗╂枡鍚嶇О",
+ anfme: "鏁伴噺",
+ stockUnit: "stockUnit",
+ workQty: "鎵ц鏁�",
+ purQty: "閲囪喘鏁�",
+ purUnit: "閲囪喘鍗曚綅",
+ qty: "鎬绘暟",
+ splrCode: "渚涘簲鍟嗙紪鐮�",
+ batch: "鎵规",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrName: "渚涘簲鍟嗗悕绉�",
+ trackCode: "璺熻釜鐮�",
+ barcode: "鏉″舰鐮�",
+ prodTime: "鐢熶骇鏃ユ湡",
+ packName: "鍖呰鍚嶇О",
+ },
+ locItem: {
+ locId: "搴撲綅ID",
+ orderId: "璁㈠崟ID",
+ type: "鍗曟嵁绫诲瀷",
+ orderItemId: "鍗曟嵁鏄庣粏ID",
+ wkType: "涓氬姟绫诲瀷",
+ matnrId: "鐗╂枡ID",
+ maktx: "鐗╂枡鍚嶇О",
+ matnrCode: "鐗╂枡缂栫爜",
+ trackCode: "璺熻釜鐮�",
+ unit: "鍗曚綅",
+ anfme: "鏁伴噺",
+ batch: "鎵规",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
+ fieldsIndex: "鍔ㄦ�佺储寮�",
},
}
},
@@ -677,12 +890,17 @@
inspection: "鎶ユ",
creatcode: "鐢熸垚鏉＄爜",
print: "鎵撳嵃",
+ detail: "鏌ョ湅璇︽儏",
enable: '鍚敤',
unenable: '绂佺敤',
locInit: '搴撲綅鍒濆鍖�',
siteInit: '绔欑偣鍒濆鍖�',
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
+ selectSite: '閫夋嫨绔欑偣',
+ cancel: "鍙栨秷",
+ top: "缃《",
+ resort: "鎺掑簭",
subzone: '缁戝畾鍒嗗尯',
bindmatnr: '缁戝畾鐗╂枡',
bindloc: '缁戝畾搴撲綅',
@@ -695,6 +913,13 @@
batchFlagCheck: "鎵归噺鍏嶆",
batchWarehouseAreas: "鎵归噺搴撳尯",
batchLocType: "鎵归噺搴撲綅绫诲瀷",
+ batchPrint: "鎵归噺鎵撳嵃",
+ quality: "璐ㄦ",
+ complete: "瀹屾垚",
+ close: "鍏抽棴",
+ asnCreate: "閫氳繃ASN鍒涘缓",
+ createTask: "鐢熸垚浠诲姟",
+ recover: "缁х画鏀惰揣",
},
};
--
Gitblit v1.9.1