From 249575ff2f0d737f4ef01dfb1c09d82078144fda Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 17 三月 2025 15:17:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/lang/zh.js |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 79a82cc..9ea19cf 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -517,7 +517,7 @@
           serialnumber: '璁㈠崟搴忓彿',
           productname: '浜у搧鍚嶇О',
           serial: '宸ヨ壓纭搴忓彿',
-          slicemarker: '鐗囨爣璁帮紙浣嶇疆锛�',
+          slicemarker: '灞傚彿',
           numberpatches: '琛ョ墖鏁伴噺',
           width: '瀹�',
           height: '楂�',
@@ -560,6 +560,38 @@
           starttime :'寮�濮嬫椂闂�',
           endtime :'缁撴潫鏃堕棿',
           loading :'姝e湪涓婄墖锛�',
+          brokenNum:'鐮存崯鏁伴噺',
+          inventory:'搴撳瓨',
+          inventoryarea:'搴撳瓨闈㈢Н',
+          shippedQuantity:'宸插彂璐ф暟閲�',
+          reportWorkQuantity:'瀹屽伐鏁伴噺',
+          reportWorkQuantityCount:'鐮存崯鏁伴噺',
+          processId:'娴佺▼鍗″彿',
+          
+          historicaltasks1:'鍘熺墖浠撳偍',
+          historicaltasks2:'涓婄墖涓�绾�',
+          historicaltasks3:'涓婄墖浜岀嚎',
+          historicaltasks4:'纾ㄨ竟浠诲姟',
+          historicaltasks5:'鍗у紡涓�绾�',
+          historicaltasks6:'鍗у紡浜岀嚎',
+          historicaltasks7:'閽㈠寲澶х悊鐗�',
+          historicaltasks8:'涓┖涓�绾�',
+          historicaltasks9:'涓┖浜岀嚎',
+          historicaltasks10:'涓┖澶х悊鐗�',
+          historicaltasks11:'鐢熶骇缁熻',
+          date:'鏃ユ湡',
+          countOutOne: '鍒囧壊涓�绾挎暟閲�',
+          totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
+          countOutTwo: '鍒囧壊浜岀嚎鏁伴噺',
+          totalAreaOutTwo: '鍒囧壊涓�绾块潰绉�',
+          countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖鏁伴噺',
+          totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
+          countOut: '閽㈠寲鏁伴噺',
+          totalAreaOut: '閽㈠寲闈㈢Н',
+          hollowCountOutOne: '涓┖涓�绾挎暟閲�',
+          hollowTotalAreaOutOne: '涓┖涓�绾块潰绉�',
+          hollowCountOutTwo: '涓┖浜岀嚎鏁伴噺',
+          hollowTotalAreaOutTwo: '涓┖浜岀嚎闈㈢Н',
       },
       reportmanage:{
           productiontime :'鐢熶骇鏃堕棿',

--
Gitblit v1.8.0