From 78caa769e452f63288743b8997f7b4c21bb06ce5 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:38 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑

---
 src/views/mobile/query.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/mobile/query.vue b/src/views/mobile/query.vue
index adb554c..02d1977 100644
--- a/src/views/mobile/query.vue
+++ b/src/views/mobile/query.vue
@@ -8,6 +8,7 @@
 import { can } from '#/mobile/access';
 import { lookup, errorText, writeBlockReason, type TraceResult, type TraceObject } from '#/mobile/api';
 import Scanner from './scanner.vue';
+import { speakDuplicateScan } from '#/mobile/scanVoice';
 defineOptions({name:'MobileQuery'});
 const route=useRoute(),key=route.path.split('/')[2]||'bags';
 const expected={bags:'bag',pallets:'pallet',batches:'batch'}[key];
@@ -39,9 +40,9 @@
     if((binding.value||autoPacking.value)&&writeBlockReason(r))throw new Error(writeBlockReason(r));
     if(autoPacking.value){
       if(r.type!=='bag')throw new Error('璇锋壂鎻忚鐮�');
-      if(r.data.palletId)throw new Error('璇ヨ鐮佸凡缁戝畾鎵樼洏锛岃鏍稿疄鍚庢搷浣�');
+      if(r.data.palletId){speakDuplicateScan('bind');throw new Error('璇ヨ鐮佸凡缁戝畾鎵樼洏锛岃鏍稿疄鍚庢搷浣�');}
       if(!r.data.itemId)throw new Error('璇ヨ鐮佺己灏戝搧绉嶏紝鏃犳硶缁戝畾鎵樼洏');
-      if(bags.value.some(b=>b.data.id===r.data.id))throw new Error('鏈宸茬粡閲囬泦璇ヨ鐮�');
+      if(bags.value.some(b=>b.data.id===r.data.id)){speakDuplicateScan('bind');throw new Error('鏈宸茬粡閲囬泦璇ヨ鐮�');}
       const first=bags.value[0];
       if(first&&first.data.itemId!==r.data.itemId)throw new Error('琚嬬爜鍝佺涓庢湰娆℃墭鐩樹笉涓�鑷�');
       if(first&&first.data.batchId!==r.data.batchId)throw new Error('琚嬬爜鎵�灞炴壒娆′笌鏈鎵樼洏涓嶄竴鑷�');
@@ -58,9 +59,9 @@
     }else{
       if(r.type!==expected)throw new Error('璇锋壂鎻�'+(key==='bags'?'琚嬬爜':'鎵樼洏鐮�'));
       if(key==='bags'){
-        if(r.data.palletId)throw new Error('璇ヨ鐮佸凡缁戝畾鎵樼洏锛岃鏍稿疄鍚庢搷浣�');
+        if(r.data.palletId){speakDuplicateScan('bind');throw new Error('璇ヨ鐮佸凡缁戝畾鎵樼洏锛岃鏍稿疄鍚庢搷浣�');}
         if(r.data.batchId&&target.value.data.batchId&&r.data.batchId!==target.value.data.batchId)throw new Error('琚嬬爜涓庣洰鏍囨墭鐩樻壒娆′笉涓�鑷�');
-        if(bags.value.some(b=>b.data.id===r.data.id))throw new Error('鏈宸茬粡閲囬泦璇ヨ鐮�');
+        if(bags.value.some(b=>b.data.id===r.data.id)){speakDuplicateScan('bind');throw new Error('鏈宸茬粡閲囬泦璇ヨ鐮�');}
         bags.value.push(r);
       }else{
         if(r.data.batchId)throw new Error('璇ユ墭鐩樺凡缁戝畾鎵规');
@@ -138,7 +139,7 @@
       <div v-if="target" class="m-panel"><p>鐩爣锛歿{target.code}}</p><p class="m-muted">{{target.data.itemName||'鏈綍鍏ュ搧绉�'}} 路 {{target.data.batchCode||'鏈粦瀹氭壒娆�'}}</p></div>
     </template>
     <template v-if="autoPacking"><h2 class="m-title">鎵弿琚嬬爜鐢熸垚鎵樼洏</h2><p class="m-muted">{{palletSize}} 琚嬩负鎻愰啋鑺傜偣 路 宸查噰闆� {{bags.length}} 琚嬨�傝揪鍒拌妭鐐逛細鎻愰啋锛屽彲闅忔椂鐢熸垚骞剁粦瀹氥��</p></template>
-    <Scanner :disabled="busy||thresholdPrompt" :continuous="autoPacking" @code="identify"/>
+    <Scanner voice-operation="bind" :duplicate-voice="binding||autoPacking" :disabled="busy||thresholdPrompt" :continuous="autoPacking" @code="identify"/>
     <section v-if="autoPacking&&thresholdPrompt" class="m-panel" role="alert" aria-labelledby="pallet-threshold-title" aria-describedby="pallet-threshold-description">
       <h2 id="pallet-threshold-title" class="m-title">宸茶揪鍒� {{palletSize}} 琚嬫彁閱掕妭鐐�</h2>
       <p id="pallet-threshold-description">鍙珛鍗崇敓鎴愬苟缁戝畾鎵樼洏鐮侊紝涔熷彲缁х画鎵弿鏇村琚嬬爜鍔犲叆鏈墭鐩樸��</p>
@@ -150,8 +151,7 @@
       <p v-else class="m-status">{{detail.data.inboundTime ? '宸插叆搴�' : '鏈叆搴�'}}<span v-if="detail.type === 'pallet'"> 路 寰呭叆搴� {{detail.data.pendingBagQuantity ?? '鈥�'}} 琚�</span></p>
       <p v-if="writeBlockReason(detail)" class="m-warning">{{writeBlockReason(detail)}}</p>
       <dl><div class="m-row"><dt>鐮佸��</dt><dd>{{detail.code}}</dd></div><div class="m-row"><dt>鎵规</dt><dd>{{detail.data.batchCode||detail.data.tempCode||'鏈粦瀹�'}}</dd></div><div class="m-row"><dt>鎵樼洏</dt><dd>{{detail.data.palletCode||'鈥�'}}</dd></div><div class="m-row"><dt>鐢熶骇鏃ユ湡</dt><dd>{{detail.data.produceDate||'鏈綍鍏�'}}</dd></div><div class="m-row"><dt>浜х嚎</dt><dd>{{detail.data.lineName||'鏈綍鍏�'}}</dd></div></dl>
-      <dl v-if="detail.type==='bag'"><div class="m-row"><dt>杩芥函鐮�</dt><dd>{{detail.data.code}}</dd></div><div class="m-row"><dt>涓氬姟鐮�</dt><dd>{{detail.data.businessCode||'鏈敓鎴�'}}</dd></div></dl>
-      <dl v-else><div class="m-row"><dt>涓氬姟鐮�</dt><dd>{{detail.data.businessCode||'鏈敓鎴�'}}</dd></div></dl>
+      <dl v-if="detail.type==='bag'"><div class="m-row"><dt>杩芥函鐮�</dt><dd>{{detail.data.code}}</dd></div></dl>
     </div>
     <template v-if="binding||autoPacking">
       <p v-if="key==='bags'" class="m-muted">宸查噰闆� {{bags.length}} 琚嬶紝灏氭湭鎻愪氦缁戝畾</p>

--
Gitblit v1.9.3