Merge branch 'fix_1001679' into release_v2.28.0

src/views/order/podUs/PodMakeOrder.vue

@@ -531,7 +531,6 @@ const podBoxList = computed(() => {
   return orderStore.podBoxList
   return orderStore.podBoxList
 })
 })
 const coverImage = ref<string>('')
 const coverImage = ref<string>('')
-
 let currentCode = ''
 let currentCode = ''
 const tableRef = ref()
 const tableRef = ref()
 watch(visible, async (value: boolean) => {
 watch(visible, async (value: boolean) => {
@@ -851,9 +850,12 @@ const handleSearch = () => {
   }
   }
   productionOrder.value = ''
   productionOrder.value = ''
   isLock.value = true
   isLock.value = true
-  const everyPower = podOrderDetailsData.value?.productList?.every(
-    (item) => item.power,
-  )
+  // 尝试修复扫下一单上一单不自动打单完成问题
+  const everyPower =
+    podOrderDetailsData.value?.pickingNumber ===
+    podOrderDetailsData.value?.purchaseNumber
+
+  console.log('⭐⭐⭐everyPower', everyPower)
   if (props.wallType === 'sort' && !isAutoPrint.value) {
   if (props.wallType === 'sort' && !isAutoPrint.value) {
     getPackingData(code)
     getPackingData(code)
     return
     return
@@ -866,6 +868,8 @@ const handleSearch = () => {
      * notPrintSuccess 未能获取打印状态
      * notPrintSuccess 未能获取打印状态
      */
      */
     // 非配货分拣 打印成功提示；配货分拣：开启自动打单且打印成功，提交；配货分拣：不开启自动打单，不提示
     // 非配货分拣 打印成功提示；配货分拣：开启自动打单且打印成功，提交；配货分拣：不开启自动打单，不提示
+    console.log('⭐⭐⭐查询printResult', podOrderDetailsData.value?.printResult)
+
     if (
     if (
       podOrderDetailsData.value?.printResult === 'printSuccess' &&
       podOrderDetailsData.value?.printResult === 'printSuccess' &&
       (props.wallType !== 'sort' ||
       (props.wallType !== 'sort' ||