提交

web-admin/src/api/admin.ts

@@ -743,6 +743,7 @@ export function fetchCreateSite(data: {
   contactName?: string
   contactPhone?: string
   businessScope?: string
+  siteImage?: string
   orderNum?: number
   remark?: string
 }) {
@@ -759,6 +760,7 @@ export function fetchUpdateSite(
     contactName: string
     contactPhone: string
     businessScope: string
+    siteImage: string
     orderNum: number
     remark: string
   }>
@@ -918,6 +920,7 @@ export function fetchCellSampleTypeList(params?: {
 export function fetchCreateCellSampleType(data: {
   typeCode: string
   typeName: string
+  typeLogo?: string
   storageYears?: number | null
   storagePrice?: number | null
   orderNum?: number
@@ -930,6 +933,7 @@ export function fetchUpdateCellSampleType(
   data: Partial<{
     typeCode: string
     typeName: string
+    typeLogo: string
     storageYears: number | null
     storagePrice: number | null
     orderNum: number
@@ -1172,6 +1176,7 @@ export function fetchExpressCompanyList(params?: {
 export function fetchCreateExpressCompany(data: {
   expressCode: string
   expressName: string
+  expressLogo?: string
   orderNum?: number
   remark?: string
 }) {
@@ -1179,7 +1184,13 @@ export function fetchCreateExpressCompany(data: {
 }
 export function fetchUpdateExpressCompany(
   id: string,
-  data: Partial<{ expressCode: string; expressName: string; orderNum: number; remark: string }>
+  data: Partial<{
+    expressCode: string
+    expressName: string
+    expressLogo: string
+    orderNum: number
+    remark: string
+  }>
 ) {
   return request.put({ url: `/web/admin/express-companies/${id}`, params: data })
 }

web-admin/src/api/material-stock-check.ts

@@ -45,6 +45,8 @@ export type MaterialStockCheckBatchLine = {
 
 export type MaterialStockCheckUnusedLine = {
   id?: string
+  usageId?: string
+  batchId?: string
   materialCode?: string
   materialName: string
   specModel?: string
@@ -64,6 +66,31 @@ export type MaterialStockCheckUnusedLine = {
   fromBatch?: boolean
 }
 
+export type MaterialStockCheckRequisition = {
+  id: string
+  materialId: string
+  materialCode: string
+  materialName: string
+  specModel: string
+  batchId: string
+  stockInNo: string
+  stockInDate: string
+  expireDate: string
+  catalogNo: string
+  batchNo: string
+  manufacturer: string
+  unitPrice: number
+  unit: string
+  requisitionQty: number
+  taskConsumedQty: number
+  receiver: string
+  receiverName: string
+  purpose: string
+  useTime: string
+  requisitionStatus: string
+  createByName: string
+}
+
 export type MaterialStockCheckDetail = MaterialStockCheck & {
   batchLines: MaterialStockCheckBatchLine[]
   unusedLines: MaterialStockCheckUnusedLine[]
@@ -121,3 +148,14 @@ export function fetchCancelMaterialStockCheck(id: string) {
     url: `/web/admin/material-stock-checks/${id}/cancel`
   })
 }
+
+export function fetchMaterialStockCheckRequisitions(params?: {
+  page?: number
+  pageSize?: number
+  keyword?: string
+}) {
+  return request.get<PageList<MaterialStockCheckRequisition>>({
+    url: '/web/admin/material-stock-check-requisitions',
+    params
+  })
+}

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

@@ -31,6 +31,7 @@ export type MaterialUsage = {
   purpose?: string
   useTime?: string
   sourceType: string
+  requisitionStatus?: string
   remark: string
   createBy: string
   createByName?: string
@@ -53,3 +54,9 @@ export function fetchMaterialUsageList(params?: {
     params
   })
 }
+
+export function fetchMarkMaterialUsageFullyUsed(usageId: string) {
+  return request.post<void>({
+    url: `/web/admin/material-usages/${usageId}/mark-fully-used`
+  })
+}

web-admin/src/api/production-material.ts

@@ -158,6 +158,7 @@ export type ProductionMaterialUsage = {
   purpose?: string
   useTime?: string
   sourceType: string
+  requisitionStatus?: string
   remark: string
   createBy: string
   createByName?: string
@@ -202,6 +203,8 @@ export type ProductionMaterialStockCheckBatchLine = {
 
 export type ProductionMaterialStockCheckUnusedLine = {
   id?: string
+  usageId?: string
+  batchId?: string
   materialCode?: string
   materialName: string
   materialType?: string
@@ -222,6 +225,33 @@ export type ProductionMaterialStockCheckUnusedLine = {
   fromBatch?: boolean
 }
 
+export type ProductionMaterialStockCheckRequisition = {
+  id: string
+  materialId: string
+  materialType: string
+  materialCode: string
+  materialName: string
+  specModel: string
+  batchId: string
+  stockInNo: string
+  stockInDate: string
+  expireDate: string
+  catalogNo: string
+  batchNo: string
+  manufacturer: string
+  storageLocation?: string
+  unitPrice: number
+  unit: string
+  requisitionQty: number
+  taskConsumedQty: number
+  receiver: string
+  receiverName: string
+  purpose: string
+  useTime: string
+  requisitionStatus: string
+  createByName: string
+}
+
 export type ProductionMaterialStockCheckDetail = ProductionMaterialStockCheck & {
   batchLines: ProductionMaterialStockCheckBatchLine[]
   unusedLines: ProductionMaterialStockCheckUnusedLine[]
@@ -366,6 +396,12 @@ export function fetchProductionMaterialUsageList(params?: {
   })
 }
 
+export function fetchMarkProductionMaterialUsageFullyUsed(usageId: string) {
+  return request.post<void>({
+    url: `/web/admin/production-material-usages/${usageId}/mark-fully-used`
+  })
+}
+
 export function fetchProductionMaterialRequisitionOptions(params?: {
   materialType?: string
   keyword?: string
@@ -454,6 +490,17 @@ export function fetchCancelProductionMaterialStockCheck(id: string) {
   })
 }
 
+export function fetchProductionMaterialStockCheckRequisitions(params?: {
+  page?: number
+  pageSize?: number
+  keyword?: string
+}) {
+  return request.get<PageList<ProductionMaterialStockCheckRequisition>>({
+    url: '/web/admin/production-material-stock-check-requisitions',
+    params
+  })
+}
+
 export type ProductionMaterialFormulaLine = {
   id?: string
   configuredMaterialId?: string

web-admin/src/api/qc-material-stock-check.ts

@@ -45,6 +45,8 @@ export type QcMaterialStockCheckBatchLine = {
 
 export type QcMaterialStockCheckUnusedLine = {
   id?: string
+  usageId?: string
+  batchId?: string
   materialCode?: string
   materialName: string
   specModel?: string
@@ -64,6 +66,31 @@ export type QcMaterialStockCheckUnusedLine = {
   fromBatch?: boolean
 }
 
+export type QcMaterialStockCheckRequisition = {
+  id: string
+  materialId: string
+  materialCode: string
+  materialName: string
+  specModel: string
+  batchId: string
+  stockInNo: string
+  stockInDate: string
+  expireDate: string
+  catalogNo: string
+  batchNo: string
+  manufacturer: string
+  unitPrice: number
+  unit: string
+  requisitionQty: number
+  taskConsumedQty: number
+  receiver: string
+  receiverName: string
+  purpose: string
+  useTime: string
+  requisitionStatus: string
+  createByName: string
+}
+
 export type QcMaterialStockCheckDetail = QcMaterialStockCheck & {
   batchLines: QcMaterialStockCheckBatchLine[]
   unusedLines: QcMaterialStockCheckUnusedLine[]
@@ -121,3 +148,14 @@ export function fetchCancelQcMaterialStockCheck(id: string) {
     url: `/web/admin/qc-material-stock-checks/${id}/cancel`
   })
 }
+
+export function fetchQcMaterialStockCheckRequisitions(params?: {
+  page?: number
+  pageSize?: number
+  keyword?: string
+}) {
+  return request.get<PageList<QcMaterialStockCheckRequisition>>({
+    url: '/web/admin/qc-material-stock-check-requisitions',
+    params
+  })
+}

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

@@ -52,6 +52,7 @@ export type QcMaterialUsage = {
   purpose?: string
   useTime?: string
   sourceType: string
+  requisitionStatus?: string
   remark: string
   createBy: string
   createByName?: string
@@ -102,3 +103,9 @@ export function fetchMyQcMaterialUsageList(params?: {
     params
   })
 }
+
+export function fetchMarkQcMaterialUsageFullyUsed(usageId: string) {
+  return request.post<void>({
+    url: `/web/admin/qc-material-usages/${usageId}/mark-fully-used`
+  })
+}

web-admin/src/api/qc-third-party-company.ts

@@ -14,6 +14,7 @@ export type QcThirdPartyCompany = {
   companyName: string
   contactName?: string
   contactPhone?: string
+  companyLogo?: string
   address?: string
   invoiceTitle?: string
   taxId?: string
@@ -49,6 +50,7 @@ export function fetchCreateQcThirdPartyCompany(data: {
   companyName: string
   contactName?: string
   contactPhone?: string
+  companyLogo?: string
   address?: string
   invoiceTitle?: string
   taxId?: string
@@ -71,6 +73,7 @@ export function fetchUpdateQcThirdPartyCompany(
     companyName: string
     contactName: string
     contactPhone: string
+    companyLogo: string
     address: string
     invoiceTitle: string
     taxId: string