From 8f8dcdae7e40ba4e94a363aa8eb91c7665810bc3 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 31 八月 2026 15:29:17 +0800
Subject: [PATCH] fix: 新疆-绿能 1.报工自动生成产品入库单 + 勾选入库 + 不合格仓库兜底
---
src/api/mes/wm/productreceipt/index.ts | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/api/mes/wm/productreceipt/index.ts b/src/api/mes/wm/productreceipt/index.ts
index 6090e5b..090f57f 100644
--- a/src/api/mes/wm/productreceipt/index.ts
+++ b/src/api/mes/wm/productreceipt/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '../../../../packages/effects/request/src';
+锘縤mport type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
@@ -8,8 +8,8 @@
id?: number; // 鍏ュ簱鍗曠紪鍙�
code?: string; // 鍏ュ簱鍗曠紪鐮�
name?: string; // 鍏ュ簱鍗曞悕绉�
- workOrderId?: number; // 鐢熶骇宸ュ崟缂栧彿
- workOrderCode?: string; // 鐢熶骇宸ュ崟缂栫爜
+ workOrderId?: number; // 鐢熶骇璁㈠崟缂栧彿
+ workOrderCode?: string; // 鐢熶骇璁㈠崟缂栫爜
itemId?: number; // 浜у搧鐗╂枡缂栧彿
itemCode?: string; // 浜у搧鐗╂枡缂栫爜
itemName?: string; // 浜у搧鐗╂枡鍚嶇О
@@ -18,7 +18,29 @@
receiptDate?: number; // 鍏ュ簱鏃ユ湡
status?: number; // 鍗曟嵁鐘舵��
remark?: string; // 澶囨敞
+ feedbackId?: number; // 鏉ユ簮鎶ュ伐缂栧彿锛堥潪绌鸿〃绀虹敱鎶ュ伐鑷姩鐢熸垚锛�
createTime?: Date; // 鍒涘缓鏃堕棿
+ }
+
+ /** 涓婃灦鍒嗛厤鏄庣粏 */
+ export interface StockDetail {
+ warehouseId: number; // 浠撳簱缂栧彿
+ locationId: number; // 搴撳尯缂栧彿
+ areaId: number; // 搴撲綅缂栧彿
+ quantity: number; // 鍒嗛厤鏁伴噺
+ }
+
+ /** 涓婃灦琛� */
+ export interface StockRow {
+ lineId: number; // 鍏ュ簱鍗曡缂栧彿
+ isStock: boolean; // 鏄惁鍏ュ簱
+ details?: StockDetail[]; // isStock=true 鏃剁殑浠撳簱/搴撳尯/搴撲綅鍒嗛厤
+ }
+
+ /** 鎵归噺涓婃灦璇锋眰 */
+ export interface StockRequest {
+ receiptId: number; // 浜у搧鍏ュ簱鍗曠紪鍙�
+ rows: StockRow[]; // 琛屼笂鏋跺垪琛�
}
}
@@ -83,6 +105,16 @@
);
}
+/** 鎵归噺涓婃灦锛堝嬀閫夋槸鍚﹀叆搴� + 鍒嗛厤浠撳簱/搴撳尯/搴撲綅鏁伴噺锛� */
+export function submitProductReceiptStock(
+ data: MesWmProductReceiptApi.StockRequest,
+) {
+ return requestClient.post<boolean>(
+ '/mes/wm/product-receipt/submit-stock',
+ data,
+ );
+}
+
/** 瀵煎嚭浜у搧鍏ュ簱鍗� */
export function exportProductReceipt(params: any) {
return requestClient.download('/mes/wm/product-receipt/export-excel', {
--
Gitblit v1.9.3