From ee7ac8df8bce38add1f75baf876b49de94b9e00a Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 17:58:33 +0800
Subject: [PATCH] feat(mes): 赋码管理绑定托盘支持未录入批次的袋码
---
src/api/mes/wm/materialstock/index.ts | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 108 insertions(+), 1 deletions(-)
diff --git a/src/api/mes/wm/materialstock/index.ts b/src/api/mes/wm/materialstock/index.ts
index 97f95b1..43315a5 100644
--- a/src/api/mes/wm/materialstock/index.ts
+++ b/src/api/mes/wm/materialstock/index.ts
@@ -28,14 +28,41 @@
reservedQuantity?: number; // 鍗犵敤閲�
inTransitQuantity?: number; // 鍦ㄩ�旈噺
availableQuantity?: number; // 鍙敤閲�
+ stockState?: number; // 搴撳瓨鐘舵�侊細10鏆傚瓨搴擄紝20鍚堟牸搴擄紝30宸插嚭搴�
+ expiryDate?: string; // 鏈夋晥鏈�
+ ageDays?: number; // 搴撻緞澶╂暟
+ warningLevel?: 'LOW_STOCK' | 'EXPIRING' | 'AGEING' | null; // 椋庨櫓绫诲瀷
receiptTime?: string; // 鍏ュ簱鏃ユ湡
frozen?: boolean; // 鏄惁鍐荤粨
+ bagCount?: number; // 褰撳墠琚嬬爜鏁伴噺
+ availableBagCount?: number; // 鍙敤琚嬬爜鏁伴噺
+ bagDetailSupported?: boolean; // 鏄惁瀛樺湪琚嬬爜鏄庣粏
createTime?: Date; // 鍒涘缓鏃堕棿
+ }
+
+ /** 搴撳瓨姹囨�荤粨鏋� */
+ export interface MaterialStockSummary {
+ itemId?: number; // 鍝佺ID锛堟寜鍝佺姹囨�绘椂杩斿洖锛�
+ itemCode?: string; // 鍝佺缂栫爜
+ itemName?: string; // 鍝佺鍚嶇О
+ batchId?: number; // 鎵规ID锛堟寜鎵规姹囨�绘椂杩斿洖锛�
+ batchCode?: string; // 鎵规鍙�
+ warehouseId?: number; // 浠撳簱ID锛堟寜浠撳簱姹囨�绘椂杩斿洖锛�
+ warehouseName?: string; // 浠撳簱鍚嶇О
+ stockState?: number; // 搴撳瓨鐘舵��
+ stockStateName?: string; // 搴撳瓨鐘舵�佸悕绉�
+ totalQuantity?: number; // 姹囨�绘暟閲�
}
}
+/** 搴撳瓨鍙拌处鍒嗛〉鏌ヨ鍙傛暟 */
+export interface MaterialStockPageParams extends PageParam {
+ warehouseType?: number; // 浠撳簱绫诲瀷锛�10鏆傚瓨搴擄紝20鍚堟牸搴擄紙鎸夌被鍨嬭繃婊や粨搴擄級
+ stockState?: number; // 搴撳瓨鐘舵�侊細10鏆傚瓨搴擄紝20鍚堟牸搴擄紝30宸插嚭搴�
+}
+
/** 鏌ヨ搴撳瓨鍙拌处鍒嗛〉 */
-export function getMaterialStockPage(params: PageParam) {
+export function getMaterialStockPage(params: MaterialStockPageParams) {
return requestClient.get<PageResult<MesWmMaterialStockApi.MaterialStock>>(
'/mes/wm/material-stock/page',
{ params },
@@ -43,6 +70,36 @@
}
/** 鏌ヨ搴撳瓨鍙拌处璇︽儏 */
+export interface MaterialStockBagDetail {
+ id: number;
+ materialStockId: number;
+ bagCodeId?: number;
+ bagCode: string;
+ batchId?: number;
+ batchCode?: string;
+ warehouseId?: number;
+ locationId?: number;
+ areaId?: number;
+ stockState?: number;
+ status?: number;
+ quantity?: number;
+ frozen?: boolean;
+ inboundTime?: string;
+ outboundTime?: string;
+}
+
+export function getMaterialStockBagDetails(params: {
+ bagCode?: string;
+ materialStockId: number;
+ pageNo?: number;
+ pageSize?: number;
+}) {
+ return requestClient.get<PageResult<MaterialStockBagDetail>>(
+ '/mes/wm/material-stock/bag-details',
+ { params },
+ );
+}
+
export function getMaterialStock(id: number) {
return requestClient.get<MesWmMaterialStockApi.MaterialStock>(
`/mes/wm/material-stock/get?id=${id}`,
@@ -106,6 +163,21 @@
return requestClient.post<number>('/mes/wm/material-stock/adjust-out', data);
}
+/** 搴撳瓨绉诲簱 */
+export interface MaterialStockMoveParams {
+ materialStockId: number; // 搴撳瓨璁板綍ID
+ toWarehouseId: number; // 鐩爣浠撳簱ID
+ toLocationId: number; // 鐩爣搴撳尯ID
+ toAreaId: number; // 鐩爣搴撲綅ID
+ quantity: number; // 绉诲簱鏁伴噺
+ remark?: string; // 澶囨敞
+}
+
+/** 搴撳瓨绉诲簱 */
+export function moveMaterialStock(data: MaterialStockMoveParams) {
+ return requestClient.post<boolean>('/mes/wm/material-stock/move', data);
+}
+
/** 搴撳瓨璋冩暣锛堟鏁�=鍏ュ簱锛岃礋鏁�=鍑哄簱锛�- 鏃ф帴鍙ｏ紝淇濈暀鍏煎 */
export interface MaterialStockAdjustParams {
itemId: number; // 鐗╂枡ID
@@ -123,3 +195,38 @@
export function adjustMaterialStock(data: MaterialStockAdjustParams) {
return requestClient.post<number>('/mes/wm/material-stock/adjust', data);
}
+
+/** 搴撳瓨姹囨�绘煡璇㈠弬鏁� */
+export interface MaterialStockSummaryParams {
+ stockState?: number; // 搴撳瓨鐘舵�侊細10鏆傚瓨搴擄紝20鍚堟牸搴擄紝30宸插嚭搴�
+ warehouseType?: number; // 浠撳簱绫诲瀷锛�10鏆傚瓨搴擄紝20鍚堟牸搴擄紙鎸夌被鍨嬭繃婊や粨搴擄級
+ itemId?: number; // 鍝佺ID
+ batchCode?: string; // 鎵规鍙�
+ warehouseId?: number; // 浠撳簱ID
+ locationId?: number; // 搴撳尯ID
+ areaId?: number; // 搴撲綅ID
+}
+
+/** 鎸夊搧绉嶆眹鎬诲簱瀛樻暟閲� */
+export function getStockSummaryByItem(params: MaterialStockSummaryParams) {
+ return requestClient.get<MesWmMaterialStockApi.MaterialStockSummary[]>(
+ '/mes/wm/material-stock/summary-by-item',
+ { params },
+ );
+}
+
+/** 鎸夋壒娆℃眹鎬诲簱瀛樻暟閲� */
+export function getStockSummaryByBatch(params: MaterialStockSummaryParams) {
+ return requestClient.get<MesWmMaterialStockApi.MaterialStockSummary[]>(
+ '/mes/wm/material-stock/summary-by-batch',
+ { params },
+ );
+}
+
+/** 鎸変粨搴撴眹鎬诲簱瀛樻暟閲� */
+export function getStockSummaryByWarehouse(params: MaterialStockSummaryParams) {
+ return requestClient.get<MesWmMaterialStockApi.MaterialStockSummary[]>(
+ '/mes/wm/material-stock/summary-by-warehouse',
+ { params },
+ );
+}
--
Gitblit v1.9.3