From fd1c7e73258027cc2adf6d8f73fba3f5bc0fc296 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <Jin980303>
Date: Sat, 10 Jan 2026 10:00:02 +0800
Subject: [PATCH] no message

---
 src/views/agvTask/AgvTask.api.ts              |  2 +-
 .../agvTask/components/ResendAgvForm.vue      |  2 +-
 src/views/conveyorLine/WcsMonitor.vue         |  8 +--
 src/views/shipping/Pick.api.ts                | 19 +++++++
 src/views/shipping/Pick.data.ts               |  7 ++-
 src/views/shipping/PickList.vue               | 55 ++++++++++++++++++-
 6 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/src/views/agvTask/AgvTask.api.ts b/src/views/agvTask/AgvTask.api.ts
index 11b16ae..b1f6ef1 100644
--- a/src/views/agvTask/AgvTask.api.ts
+++ b/src/views/agvTask/AgvTask.api.ts
@@ -15,7 +15,7 @@ enum Api {
   callBackTask = '/tes/callBackTask',
   cancelTes = '/tes/cancelTes',
   cancelAgv = '/api/robot/cancelAgv',
-  resendTes = '/tes/apiv2/resendTes',
+  resendTes = '/tes/resendTes',
   resendAgv = '/api/robot/resendAgv',
 }
 
diff --git a/src/views/agvTask/components/ResendAgvForm.vue b/src/views/agvTask/components/ResendAgvForm.vue
index 3b86617..8387773 100644
--- a/src/views/agvTask/components/ResendAgvForm.vue
+++ b/src/views/agvTask/components/ResendAgvForm.vue
@@ -47,7 +47,7 @@
                 <JSearchSelect
                   v-model:value="formData.endCode"
                   placeholder="请选择目标库位"
-                  dict="base_point where iz_active=1 and del_flag=0 ,point_code,point_code"
+                  dict="base_point where status=0 and iz_active=1 and del_flag=0 ,point_code,point_code"
                   allowClear
                 />
               </a-form-item>
diff --git a/src/views/conveyorLine/WcsMonitor.vue b/src/views/conveyorLine/WcsMonitor.vue
index 015dd24..dc1ad7e 100644
--- a/src/views/conveyorLine/WcsMonitor.vue
+++ b/src/views/conveyorLine/WcsMonitor.vue
@@ -67,7 +67,7 @@
               <circle cx="12" cy="10" r="3"></circle>
               <path d="M12 21.7C17.3 17 20 13 20 10a8 8 0 1 0-16 0c0 3 2.7 7 8 11.7z"></path>
             </svg>
-            <span>目的站 DESTINATION</span>
+            <span>工作站 DESTINATION</span>
           </div>
           <div class="card-value value-pink">{{ scanData.endCode }}</div>
         </div>
@@ -82,7 +82,7 @@
           </svg>
           <span class="label-mix">特殊描述 / REMARKS</span>
         </div>
-        <div class="remark-text">{{ scanData.description===''?'无到站任务！！！':scanData.description }}</div>
+        <div class="remark-text">{{ scanData.description }}</div>
       </section>
     </main>
   </div>
@@ -123,7 +123,7 @@
   });
 
   async function queryData() {
-    const conveyorLine = '3F-F1-ELE-01L-L';
+    const conveyorLine = '3F-F1-ELE-02L-L';//3F-F1-ELE-01L-L
     const res = await showConveyorLine(conveyorLine);
         scanData.value = {
           stockCode: res.stockCode,
@@ -431,7 +431,7 @@
   }
 
   .remark-text {
-    font-size: 30px;
+    font-size: 60px;
     color: #d1d5db; /* 灰白色，不刺眼 */
     font-weight: bold;
   }
diff --git a/src/views/shipping/Pick.api.ts b/src/views/shipping/Pick.api.ts
index cc6c5dc..3f7cbcc 100644
--- a/src/views/shipping/Pick.api.ts
+++ b/src/views/shipping/Pick.api.ts
@@ -18,6 +18,7 @@ enum Api {
   cancelAllocate = '/shipping/pick/cancelAllocate',
   pickTask = '/shipping/pick/pickTask',
   pickBack = '/shipping/pick/pickBack',
+  closePick = '/shipping/pick/closePick',
 }
 
 /**
@@ -161,3 +162,21 @@ export const pickBack = (id, handleSuccess) => {
     handleSuccess();
   });
 };
+
+/**
+ * 出库单关闭
+ * @param params
+ */
+export const closePick = (ids, handleSuccess) => {
+  return defHttp
+    .get(
+      {
+        url: Api.closePick,
+        params: { ids },
+      },
+      { joinParamsToUrl: true }
+    )
+    .then(() => {
+      handleSuccess();
+    });
+};
diff --git a/src/views/shipping/Pick.data.ts b/src/views/shipping/Pick.data.ts
index 44a7618..f735169 100644
--- a/src/views/shipping/Pick.data.ts
+++ b/src/views/shipping/Pick.data.ts
@@ -278,9 +278,14 @@ export const taskColumns: JVxeColumn[] = [
     defaultValue: '0',
     disabled: true,
   },
+  {
+    title: '请求报文',
+    key: 'reqMessage',
+    type: JVxeTypes.normal,
+  },
   {
     title: '返回报文',
     key: 'resMessage',
     type: JVxeTypes.normal,
-  }
+  },
 ];
diff --git a/src/views/shipping/PickList.vue b/src/views/shipping/PickList.vue
index ab24db9..177d858 100644
--- a/src/views/shipping/PickList.vue
+++ b/src/views/shipping/PickList.vue
@@ -91,6 +91,16 @@
         >
           出库回传
         </a-button>
+        <a-button
+          type="warning"
+          :loading="closePick_loading"
+          :disabled="selectedRowKeys.length === 0"
+          v-auth="'shipping:data_pick:closePick'"
+          @click="handleClosePick"
+          preIcon="ant-design:edit-outlined"
+        >
+          手工关单
+        </a-button>
         <a-button type="primary" v-auth="'shipping:data_pick:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出 </a-button>
         <j-upload-button type="primary" v-auth="'shipping:data_pick:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
           >导入
@@ -129,7 +139,18 @@
   import { useModal } from '/@/components/Modal';
   import PickModal from './components/PickModal.vue';
   import { columns } from './Pick.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, allocatePick, cancelAllocate, pickTask, pickBack } from './Pick.api';
+  import {
+    list,
+    deleteOne,
+    batchDelete,
+    getImportUrl,
+    getExportUrl,
+    allocatePick,
+    cancelAllocate,
+    pickTask,
+    pickBack,
+    closePick,
+  } from './Pick.api';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getDateByPicker } from '/@/utils';
   import { JInputTypeEnum } from '@/enums/cpteEnum';
@@ -295,7 +316,7 @@
     const validStatuses = [4, 5];
     const allValidStatus = selectedRows.value.every((row: any) => validStatuses.includes(row.status));
     if (!allValidStatus) {
-      return createMessage.error('【部分拣货、拣货完成】状态的入库单才允许回传');
+      return createMessage.error('【部分拣货、拣货完成】状态的出库单才允许回传');
     }
     if (pickBack_loading.value) {
       return;
@@ -313,6 +334,36 @@
     }
   }
 
+
+  /**
+   * 关单事件
+   */
+  const closePick_loading = ref(false);
+
+  async function handleClosePick() {
+    // 选中的数据中状态有4、5 返回true,否则返回false
+    const validStatuses = [4, 5];
+    const allValidStatus = selectedRows.value.every((row: any) => validStatuses.includes(row.status));
+    if (!allValidStatus) {
+      return createMessage.error('【部分拣货、拣货完成】状态的出库单才允许关单');
+    }
+    if (closePick_loading.value) {
+      return;
+    }
+    // 设置加载状态，防止重复提交
+    closePick_loading.value = true;
+    try {
+      await closePick(selectedRowKeys.value, handleSuccess);
+    } catch (e) {
+      console.error('关单失败:', e);
+      handleSuccess();
+    } finally {
+      // 重置加载状态
+      closePick_loading.value = false;
+    }
+  }
+
+
   /**
    * 编辑事件
    */