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 @@
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 @@
- 目的站 DESTINATION
+ 工作站 DESTINATION
{{ scanData.endCode }}
@@ -82,7 +82,7 @@
特殊描述 / REMARKS
-
+
@@ -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 @@
>
出库回传
+
+ 手工关单
+
导出
导入
@@ -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;
+ }
+ }
+
+
/**
* 编辑事件
*/