提交

web-admin/src/api/qc-material-usage.ts

@@ -8,6 +8,21 @@ type PageList<T> = {
   totalPages: number
 }
 
+export type QcMaterialRequisitionOption = {
+  id: string
+  label: string
+  materialId: string
+  materialName: string
+  stockInNo: string
+  batchNo: string
+  batchId: string
+  receiver: string
+  receiverName: string
+  requisitionQty: number
+  usageUnit: string
+  useTime: string
+}
+
 export type QcMaterialUsage = {
   id: string
   materialId: string
@@ -23,8 +38,14 @@ export type QcMaterialUsage = {
   amount?: number | null
   changeType: string
   changeQty: number
+  usageUnit?: string
   stockBefore?: number
   stockAfter: number
+  parentUsageId?: string
+  requisitionUsageId?: string
+  receiverName?: string
+  requisitionReceiver?: string
+  requisitionReceiverName?: string
   qcTaskId: string
   qcTaskNo: string
   receiver?: string
@@ -52,3 +73,35 @@ export function fetchQcMaterialUsageList(params?: {
     params
   })
 }
+
+export function fetchQcMaterialRequisitionOptions(params?: {
+  keyword?: string
+  limit?: number
+}) {
+  return request.get<QcMaterialRequisitionOption[]>({
+    url: '/web/admin/qc-material-requisition-options',
+    params
+  })
+}
+
+export function fetchQcMaterialLinkedTaskUsages(usageId: string) {
+  return request.get<QcMaterialUsage[]>({
+    url: `/web/admin/qc-material-usages/${usageId}/linked-task-usages`
+  })
+}
+
+export function fetchMyQcMaterialUsageList(params?: {
+  page?: number
+  pageSize?: number
+  materialId?: string
+  changeType?: string
+  startTime?: string
+  endTime?: string
+  keyword?: string
+  stockInNo?: string
+}) {
+  return request.get<PageList<QcMaterialUsage>>({
+    url: '/web/admin/my-qc-material-usages',
+    params
+  })
+}

web-admin/src/api/qc-task-result.ts

@@ -25,6 +25,11 @@ export type QcTaskMaterialUsageItem = {
   catalogNo?: string
   manufacturer?: string
   changeQty: number
+  usageUnit?: string
+  requisitionUsageId?: string
+  parentUsageId?: string
+  receiverName?: string
+  requisitionReceiverName?: string
   remark?: string
 }
 
@@ -41,7 +46,12 @@ export function fetchCompleteTaskWithResult(
     results: QcTaskResultItem[]
     remark?: string
     thirdPartyAttachments?: string
-    materialUsages?: Array<{ batchId: string; qty: number; remark?: string }>
+    materialUsages?: Array<{
+      requisitionUsageId: string
+      qty: number
+      usageUnit?: string
+      remark?: string
+    }>
   }
 ) {
   return request.post({