Merge branch 'dev_sorting_complete' into 'dev'

Dev sorting complete

See merge request !233

src/api/factoryOrderNew.ts

@@ -684,3 +684,11 @@ export function exportOrderInventoryApi(data: Record<string, unknown>) {
     data,
   )
 }
+
+// 配货完成 按钮
+export function deliveryCompleteApi(data: { id: number; version?: number }[]) {
+  return axios.post<never, BaseRespData<ResultInfoDataItem[]>>(
+    'factory/podOrder/podPrintOrderShipmentComplete',
+    { orderParamList: data },
+  )
+}

src/views/order/factoryOrderNew/index.vue

@@ -681,6 +681,11 @@
         >
           <ElButton type="danger" @click="handleSuspend">挂起</ElButton>
         </span>
+        <span v-if="['PICKING'].includes(status)" class="item">
+          <ElButton type="success" @click="handleDeliveryComplete"
+            >配货完成</ElButton
+          >
+        </span>
         <span v-if="status === 'PENDING_PACKING'" class="item">
           <ElButton type="success" @click="handlePrintWarehouseSkuTag"
             >打印库存SKU标签</ElButton
@@ -1273,6 +1278,7 @@ import {
   exportFactoryOrderInfo,
   interceptUpdateApi,
   interceptSuccessApi,
+  deliveryCompleteApi,
 } from '@/api/factoryOrderNew'
 import { getConfigApi } from '@/api/order'
 import { getLogisticsWayApi } from '@/api/podUsOrder'
@@ -2995,6 +3001,35 @@ const handlePickComplete = () => {
   if (!ensureSelection()) return
   pickCompleteDialogRef.value?.open(getSelectedIds())
 }
+const handleDeliveryComplete = () => {
+  if (!ensureSelection()) return
+  ElMessageBox.confirm('确定完成发货吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+  })
+    .then(async () => {
+      const params = selectedRows.value.map((row) => ({
+        id: row.id,
+        version: row.version,
+      }))
+      const loading = ElLoading.service({
+        fullscreen: true,
+        text: '操作中...',
+        background: 'rgba(0, 0, 0, 0.3)',
+      })
+      try {
+        const res = await deliveryCompleteApi(params)
+        if (res.code !== 200) return
+        ElMessage.success('操作成功')
+      } catch (e) {
+        console.error(e)
+      } finally {
+        loading.close()
+        refreshCurrentView({ isRefreshTree: true })
+      }
+    })
+    .catch(() => {})
+}
 const handlePickFail = () => {
   if (!ensureSelection()) return
   pickFailDialogRef.value?.open(getSelectedIds(), {

src/views/order/podUs/PodMakeOrder.vue

@@ -1540,10 +1540,6 @@ const getSortingAreaList = async () => {
   sortingAreaId.value = defaultArea.id
   warehouseId.value = defaultArea.warehouseId
   isAutoPrint.value = defaultArea.autoPrint || false
-  emit('set-warehouseId', {
-    warehouseId: warehouseId.value,
-    sortingAreaId: sortingAreaId.value,
-  })
 }
 </script>