From 8dd12f3fb9f2c8c8b319bad323209f28429a80ef Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 29 九月 2026 15:04:24 +0800
Subject: [PATCH] feat(mes): 扫码追溯适配16位纯数字编码
---
src/api/mes/pro/bagCode/index.ts | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/api/mes/pro/bagCode/index.ts b/src/api/mes/pro/bagCode/index.ts
index 22d4b6e..493647c 100644
--- a/src/api/mes/pro/bagCode/index.ts
+++ b/src/api/mes/pro/bagCode/index.ts
@@ -15,6 +15,9 @@
lineName?: string; // 浜х嚎鍚嶇О
palletId?: number; // 缁戝畾鎵樼洏缂栧彿
palletCode?: string; // 鎵樼洏鐮�
+ itemId?: number; // 鍝佺锛堢墿鏂欙級缂栧彿
+ itemCode?: string; // 鍝佺缂栫爜
+ itemName?: string; // 鍝佺鍚嶇О
status?: number; // 鐘舵�侊紙瀛楀吀 mes_pro_bag_code_status锛�
printTime?: string; // 瀵煎嚭锛堜氦浠樺嵃鍒凤級鏃堕棿
cancelTime?: string; // 浣滃簾鏃堕棿
@@ -30,18 +33,32 @@
batchCode?: string;
uuid?: string;
palletId?: number;
+ itemId?: number;
status?: number;
createTime?: string[];
}
- /** 鐢熸垚鏁版嵁鍖呰姹� */
+ /** 鐢熸垚鏁版嵁鍖呰姹傦紙鍝佺涓昏閲忓崟浣嶇被鍨嬩负 N鍗冨厠 鏃舵寜鎵樼洏鏁版崲绠楄鏁帮紱涓� 鍚� 鏃舵棤鎵樼洏銆佺洿鎺ヨ緭鍏ヨ鐮佹暟锛� */
export interface GenerateParams {
- count: number; // 鐢熸垚琚嬫暟
+ itemId: number; // 鍝佺锛堢墿鏂欙級缂栧彿
+ palletCount?: number; // 鎵樼洏鏁帮紙48鍗冨厠/100鍗冨厠 鍝佺蹇呭～锛�
+ bagCount?: number; // 琚嬬爜鏁帮紙鍚ㄥ搧绉嶅繀濉級
remark?: string; // 澶囨敞
}
export interface GenerateResult {
- uuid?: string;
+ uuid?: string; // 鐢熸垚缁� UUID
+ type?: string; // 鍝佺涓昏閲忓崟浣嶇被鍨嬶紙48鍗冨厠/100鍗冨厠/鍚級
+ perPallet?: number; // 姣忔墭琚嬫暟锛堝惃鍝佺涓� 0锛�
+ totalCount?: number; // 鐢熸垚琚嬬爜鎬绘暟
+ palletIds?: number[]; // 鑷姩鐢熸垚鐨勬墭鐩樼紪鍙峰垪琛紙鍚ㄥ搧绉嶄负绌猴級
+ }
+
+ /** 鐢熸垚鍘熷琚嬬爜璇锋眰锛堜粎鍝佺+琚嬬爜鏁伴噺锛屼笉鍏宠仈璁￠噺鍗曚綅绫诲瀷銆佷笉鐢熸垚鎵樼洏锛� */
+ export interface RawGenerateParams {
+ itemId: number; // 鍝佺锛堢墿鏂欙級缂栧彿
+ count: number; // 琚嬬爜鏁伴噺
+ remark?: string; // 澶囨敞
}
export interface BindBatchParams {
@@ -125,6 +142,14 @@
);
}
+/** 鐢熸垚鍘熷琚嬬爜锛堜粎閫夊搧绉嶄笌琚嬬爜鏁伴噺锛屼笉鐢熸垚鎵樼洏锛涜繑鍥炵敓鎴愮粍 UUID锛� */
+export function generateRawBagCodes(data: MesProBagCodeApi.RawGenerateParams) {
+ return requestClient.post<MesProBagCodeApi.GenerateResult>(
+ '/mes/pro/bag-code/raw-generate',
+ data,
+ );
+}
+
/** 褰曞叆鐢熶骇鎵规 */
export function bindBagCodeBatch(data: MesProBagCodeApi.BindBatchParams) {
return requestClient.put('/mes/pro/bag-code/bind-batch', data);
@@ -167,6 +192,16 @@
);
}
+/**
+ * 鎵爜杩芥函锛氭牴鎹紪鐮佽В鏋愬叾绫诲瀷锛坆ag / pallet / batch锛夈��
+ * 缂栫爜缁熶竴涓恒��16 浣嶇函鏁板瓧銆嶅悗鏃犳硶鎸夊墠缂�鍒ゆ柇绫诲瀷锛屾敼鐢卞悗绔В鏋愶紱鍧囦笉鍖归厤杩斿洖 null銆�
+ */
+export function resolveTraceType(code: string) {
+ return requestClient.get<'bag' | 'batch' | 'pallet' | null>(
+ `/mes/pro/trace/resolve-type?code=${encodeURIComponent(code)}`,
+ );
+}
+
/** 鏌ヨ琚嬬爜鍒嗛〉 */
export function getBagCodePage(params: MesProBagCodeApi.PageParams) {
return requestClient.get<PageResult<MesProBagCodeApi.BagCode>>(
--
Gitblit v1.9.3