From f25d75ffb9b015e88e5eb816d397e0fbae10bff8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 13:45:15 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/zh.js |  102 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index bbe448c..1a7617c 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -141,6 +141,8 @@
         serialRule: '缂栫爜瑙勫垯',
         asnOrder: '鏀惰揣閫氱煡鍗�',
         asnOrderItem: '鏀惰揣鏄庣粏',
+        asnOrderLog: '鏀惰揣鍘嗗彶鍗�',
+        asnOrderItemLog: '鏀惰揣鍘嗗彶鏄庣粏',
         purchase: 'PO鍗�',
         purchaseItem: 'PO鍗曟槑缁�',
         whMat: '搴撳尯鐗╂枡鍏崇郴',
@@ -148,8 +150,10 @@
         fieldsItem: '鎵╁睍瀛楁鏄庣粏',
         warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
         deviceSite: '绔欑偣绠$悊',
-        waitPakin: 'WaitPakin',
-        waitPakinItem: 'WaitPakinItem',
+        waitPakin: '缁勬嫋閫氱煡妗�',
+        waitPakinItem: '缁勬嫋妗f槑缁�',
+        waitPakinLog: '缁勬嫋鍘嗗彶妗�',
+        waitPakinItemLog: '缁勬嫋鍘嗗彶妗f槑缁�',
     },
     table: {
         field: {
@@ -510,12 +514,50 @@
                 maktx: "鐗╂枡鍚嶇О",
                 anfme: "鏁伴噺",
                 stockUnit: "搴撳瓨鍗曚綅",
+                purQty: "璁″垝鏀惰揣鏁伴噺",
+                purUnit: "閲囪喘鍗曚綅",
+                qty: "宸插畬鎴愭暟閲�",
+                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrCode: "渚涘簲鍟嗙紪鐮�",
+                splrName: "渚涘簲鍟嗗悕绉�",
+                qrcode: "浜岀淮鐮�",
+                barcode: "鏉″舰鐮�",
+                packName: "鍖呰鍚嶇О",
+                ntyStatus: "鎶ユ鐘舵��",
+                prodTime: "鐢熶骇鏃ユ湡",
+            },
+            asnOrderLog: {
+                code: "缂栫爜",
+                poCode: "PO缂栫爜",
+                poId: "PO鏍囪瘑",
+                type: "鍗曟嵁绫诲瀷",
+                wkType: "涓氬姟绫诲瀷",
+                anfme: "鏁伴噺",
+                qty: "宸插畬鎴愭暟閲�",
+                logisNo: "鐗╂祦鍗曞彿",
+                arrTime: "棰勮鍒拌揪鏃堕棿",
+                rleStatus: "閲婃斁鐘舵��",
+                ntyStatus: "璐ㄦ涓婃姤鐘舵��",
+            },
+            asnOrderItemLog: {
+                asnId: "涓诲崟鏍囪瘑",
+                asnCode: "涓诲崟缂栫爜",
+                platItemId: "erp鏍囪瘑",
+                poDetlId: "PO鍗曟爣璇�",
+                poCode: "PO鍗曠紪鐮�",
+                fieldsIndex: "瀛楁绱㈠紩",
+                matnrId: "鐗╂枡鏍囪瘑",
+                matnrCode: "鐗╂枡缂栫爜",
+                maktx: "鐗╂枡",
+                anfme: "鏁伴噺",
                 purQty: "閲囪喘鏁伴噺",
                 purUnit: "閲囪喘鍗曚綅",
                 qty: "宸插畬鎴愭暟閲�",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
+                splrBatch: "渚涘簲鍟嗘壒娆�",
                 splrName: "渚涘簲鍟嗗悕绉�",
                 qrcode: "浜岀淮鐮�",
+                trackCode: "鏉″舰鐮�",
                 barcode: "鏉″舰鐮�",
                 packName: "鍖呰鍚嶇О",
                 ntyStatus: "鎶ユ鐘舵��",
@@ -577,24 +619,48 @@
                 sites: "浣滀笟绔欑偣",
             },
             waitPakin: {
-                code: "code",
-                ansId: "ansId",
-                asnCode: "asnCode",
-                barcode: "barcode",
-                anfme: "anfme",
-                ioStatus: "ioStatus",
+                code: "缂栫爜",
+                ansId: "鏀惰揣閫氱煡鍗曞彿",
+                asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+                barcode: "鏉″舰鐮�",
+                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: "鐗╂枡缂栫爜",
+                anfme: "鏁伴噺",
+                workQty: "鎵ц涓暟閲�",
+                unit: "鍗曚綅",
+                fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+                qty: "宸插畬鎴�",
+                batch: "鎵规",
+            },
+            waitPakinLog: {
+                pakinId: "缁勬墭Id",
+                code: "缂栫爜",
+                barcode: "鏉″舰鐮�",
+                anfme: "鏁伴噺",
+                ioStatus: "鐘舵��",
+            },
+            waitPakinItemLog: {
+                pakinId: "缁勬墭Id",
+                pakinItemId: "缁勬墭鏄庣粏Id",
+                ansId: "鏀惰揣閫氱煡鍗曞彿",
+                asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+                asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
+                trackCode: "鏉″舰鐮�",
+                maktx: "鐗╂枡",
+                matnrId: "鐗╂枡id",
+                matnrCode: "鐗╂枡缂栫爜",
+                anfme: "鏁伴噺",
+                workQty: "鎵ц涓暟閲�",
+                unit: "鍗曚綅",
+                fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+                qty: "宸插畬鎴�",
+                batch: "鎵规",
             },
         }
     },

--
Gitblit v1.9.1