From d2e0994f67495fd436a2e8ad02cb7e4a7e53fe0c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 08:04:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index ab9b188..5651c4a 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -646,11 +646,11 @@
arrTime: "棰勮鍒拌揪鏃堕棿",
rleStatus: "閲婃斁鐘舵��",
ntyStatus: "涓婃姤鐘舵��",
- exceStatus: '鍗曟嵁鐘舵��'
+ exceStatus: '鎵ц鐘舵��'
},
asnOrderItem: {
- asnId: "涓诲崟鏍囪瘑",
- asnCode: "鍗曞彿",
+ orderId: "涓诲崟鏍囪瘑",
+ orderCode: "鍗曞彿",
poDetlId: "PO鍗旾D",
poDetlCode: "PO鍗�",
platItemId: '琛屽彿',
@@ -682,8 +682,8 @@
prodTime: "鐢熶骇鏃ユ湡",
},
outStockItem: {
- asnId: "涓诲崟鏍囪瘑",
- asnCode: "鍗曞彿",
+ orderId: "涓诲崟鏍囪瘑",
+ orderCode: "鍗曞彿",
poCode: 'DO鍗曞彿',
poDetlId: "骞冲彴鏄庣粏ID",
poDetlCode: "DO鍗�",
@@ -721,8 +721,8 @@
ntyStatus: "璐ㄦ涓婃姤鐘舵��",
},
asnOrderItemLog: {
- asnId: "涓诲崟鏍囪瘑",
- asnCode: "涓诲崟缂栫爜",
+ orderId: "涓诲崟鏍囪瘑",
+ orderCode: "涓诲崟缂栫爜",
platItemId: "erp鏍囪瘑",
poDetlId: "PO鍗曟爣璇�",
poDetlCode: "PO鍗曠紪鐮�",
--
Gitblit v1.9.1