From 21599300cc73ff7384b74cc5e4ac2cbd82bdc293 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 28 十月 2026 18:34:29 +0800
Subject: [PATCH] feat(wls): 更新销售退货功能支持关联销售出库单
---
src/api/mes/pro/bagCode/index.ts | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/src/api/mes/pro/bagCode/index.ts b/src/api/mes/pro/bagCode/index.ts
index 7ea1122..54cb12d 100644
--- a/src/api/mes/pro/bagCode/index.ts
+++ b/src/api/mes/pro/bagCode/index.ts
@@ -47,6 +47,7 @@
palletCount?: number; // 鎵樼洏鏁帮紙48琚�/100琚� 鍝佺蹇呭～锛�
bagCount?: number; // 琚嬬爜鏁帮紙鍚ㄥ搧绉嶅繀濉級
remark?: string; // 澶囨敞
+ requestId?: string; // 骞傜瓑閿細缃戠粶閲嶈瘯澶嶇敤鍚屼竴涓��
}
export interface GenerateResult {
@@ -54,7 +55,10 @@
type?: string; // 鍝佺涓昏閲忓崟浣嶇被鍨嬶紙48琚�/100琚�/鍚級
perPallet?: number; // 姣忔墭琚嬫暟锛堝惃鍝佺涓� 0锛�
totalCount?: number; // 鐢熸垚琚嬬爜鎬绘暟
- palletIds?: number[]; // 鑷姩鐢熸垚鐨勬墭鐩樼紪鍙峰垪琛紙鍚ㄥ搧绉嶄负绌猴級
+ palletCount?: number; // 鎵樼洏鎬绘暟锛堝師濮嬫暟鎹负 0锛�
+ palletIds?: number[]; // 鑷姩鐢熸垚鐨勬墭鐩樼紪鍙峰垪琛紙浠呭悓姝ュ畬鎴愯繑鍥烇紝鍚ㄥ搧绉嶄负绌猴級
+ async?: boolean; // true=宸茶浆鍚庡彴浠诲姟
+ taskId?: number; // 鍚庡彴浠诲姟缂栧彿锛堝紓姝ユā寮忚繑鍥烇級
}
/** 鐢熸垚鍘熷琚嬬爜璇锋眰锛堜粎鍝佺+琚嬬爜鏁伴噺锛屼笉鍏宠仈璁￠噺鍗曚綅绫诲瀷銆佷笉鐢熸垚鎵樼洏锛� */
@@ -62,6 +66,28 @@
itemId: number; // 鍝佺锛堢墿鏂欙級缂栧彿
count: number; // 琚嬬爜鏁伴噺
remark?: string; // 澶囨敞
+ requestId?: string; // 骞傜瓑閿細缃戠粶閲嶈瘯澶嶇敤鍚屼竴涓��
+ }
+
+ /** 琚嬬爜鐢熸垚浠诲姟锛堝ぇ鎵归噺鐢熸垚杞悗鍙板悗鐨勮繘搴︼級 */
+ export interface GenerateTask {
+ id: number; // 浠诲姟缂栧彿
+ bizType?: string; // PACKAGE锛堟暟鎹寘锛�/ RAW锛堝師濮嬫暟鎹級
+ status?: number; // 10 鎺掗槦涓� / 20 鐢熸垚涓� / 25 鍙栨秷涓� / 30 宸插畬鎴� / 40 宸插彇娑� / 50 宸插け璐�
+ statusName?: string; // 鐘舵�佸悕绉�
+ progress?: number; // 杩涘害鐧惧垎姣� 0~100
+ uuid?: string; // 鐢熸垚缁� UUID
+ itemId?: number; // 鍝佺缂栧彿
+ itemCode?: string; // 鍝佺缂栫爜
+ itemName?: string; // 鍝佺鍚嶇О
+ unitType?: string; // 璁￠噺鍗曚綅绫诲瀷
+ perPallet?: number; // 姣忔墭琚嬫暟
+ palletCount?: number; // 鎵樼洏鏁�
+ totalCount?: number; // 琚嬬爜鎬绘暟
+ finishedCount?: number; // 宸茬敓鎴愯鐮佹暟
+ errorMsg?: string; // 澶辫触鍘熷洜
+ createTime?: string; // 鍒涘缓鏃堕棿
+ finishTime?: string; // 瀹屾垚/缁堟鏃堕棿
}
export interface BindBatchParams {
@@ -155,6 +181,21 @@
);
}
+/** 鏌ヨ琚嬬爜鐢熸垚浠诲姟锛堝ぇ鎵归噺鐢熸垚鐨勮繘搴﹁疆璇級 */
+export function getBagCodeGenerateTask(id: number) {
+ return requestClient.get<MesProBagCodeApi.GenerateTask>(
+ '/mes/pro/bag-code/generate-task/get',
+ { params: { id } },
+ );
+}
+
+/** 鍙栨秷琚嬬爜鐢熸垚浠诲姟锛堝仠姝㈢敓鎴愬苟娓呯悊鍗婃垚鍝侊級 */
+export function cancelBagCodeGenerateTask(id: number) {
+ return requestClient.post<boolean>(
+ `/mes/pro/bag-code/generate-task/cancel?id=${id}`,
+ );
+}
+
/** 褰曞叆鐢熶骇鎵规 */
export function bindBagCodeBatch(data: MesProBagCodeApi.BindBatchParams) {
return requestClient.put('/mes/pro/bag-code/bind-batch', data);
@@ -222,6 +263,18 @@
);
}
+/** 鍒嗛〉鏌ヨ鍙粦瀹氭壒娆＄殑鍚ㄨ锛堟棤鎵樼洏涓旀湭缁戝畾鎵规锛屽搧绉嶈閲忓崟浣嶄负鍚級 */
+export function getUnboundTonBagPage(params: {
+ keyword?: string;
+ pageNo: number;
+ pageSize: number;
+}) {
+ return requestClient.get<PageResult<MesProBagCodeApi.BagCode>>(
+ '/mes/pro/bag-code/unbound-ton-bag-page',
+ { params },
+ );
+}
+
/** 鎵归噺瀵煎嚭琚嬬爜 Excel锛堜氦浠樺嵃鍒凤級 */
export function exportBagCodeExcel(params: MesProBagCodeApi.PageParams) {
return requestClient.download('/mes/pro/bag-code/export-excel', { params });
--
Gitblit v1.9.3