入库单初版接口

e63ec0ef · wuqian · e0b8b1b1 · e63ec0ef · e63ec0ef · e63ec0ef
Commit e63ec0ef authored May 27, 2025 by wuqian
Showing with 144 additions and 87 deletions

src/api/warehouse.ts
+81 -60

src/components/ImageView.vue
+1 -1

src/types/api/warehouse.ts
+30 -24

src/utils/hooks/useImagePreview..ts
+31 -1

src/views/warehouse/issueDoc.vue
+1 -1

src/views/warehouse/receiptDoc.vue
+0 -0

No files found.
--- a/src/api/warehouse.ts
+++ b/src/api/warehouse.ts
@@ -4,92 +4,92 @@ import {
  warehouseSearchForm,
  InterWarehousePage,
  InterWarehouseTree,
+  InterWarehouseDetail,
  InterskuList,
  InterWarehouseList,
  ILocation,
  InRecordEditForm,
 } from '@/types/api/warehouse'
-export interface LogListData{
+export interface LogListData {
-  createTime:string
+  createTime: string
-  description:string
+  description: string
 }
-export interface PrintData{
+export interface PrintData {
-  code:string
+  code: string
-  list:{locationName:string,pickingLocation:string}[]
+  list: { locationName: string; pickingLocation: string }[]
 }
 export interface factoryWarehouseInfo {
  pageSize: number
  currentPage: number
  total?: number
-  warehouseId?: string;
+  warehouseId?: string
-  locationName?: string;
+  locationName?: string
-  remark?: string;
+  remark?: string
 }
 export interface WarehouseInventory {
-  pageSize: number;
+  pageSize: number
-  currentPage: number;
+  currentPage: number
-  total?: number;
+  total?: number
-  warehouseId: string;
+  warehouseId: string
-  skuName: string;
+  skuName: string
-  warehouseSku: string;
+  warehouseSku: string
-  occupyInventory: string;
+  occupyInventory: string
-  freezeInventory: string;
+  freezeInventory: string
-  inventory: string;
+  inventory: string
-  upperLimit: string;
+  upperLimit: string
-  usableInventoryStart: string;
+  usableInventoryStart: string
-  usableInventoryEnd: string;
+  usableInventoryEnd: string
-  occupyInventoryEnd: string;
+  occupyInventoryEnd: string
-  occupyInventoryStart: string;
+  occupyInventoryStart: string
-  floorLimit: string;
+  floorLimit: string
 }
 export interface UpdateDefaulted {
-  id?: number | string;
+  id?: number | string
-  defaulted: number;
+  defaulted: number
 }
 export interface UpdateStatus {
-  id?: number;
+  id?: number
-  status: number | undefined;
+  status: number | undefined
 }
 export interface warehouseInfo {
-  id?: number | string;
+  id?: number | string
-  name: string;
+  name: string
-  code: string;
+  code: string
-  sort: string;
+  sort: string
-  defaulted: number;
+  defaulted: number
-  factoryId?: number;
+  factoryId?: number
-  factoryCode?: string;
+  factoryCode?: string
  remarks: string
 }
 export interface WarehouseWarning {
-  id: number | string;
+  id: number | string
-  locationCode: string;
+  locationCode: string
-  locationName: string;
+  locationName: string
 }
 export interface positionInfo {
-  id?: number;
+  id?: number
-  warehouseId?: string | number;
+  warehouseId?: string | number
-  locationName: string;
+  locationName: string
-  pickingOrder: string;
+  pickingOrder: string
-  locationCode: string;
+  locationCode: string
-  warehouseName?: string;
+  warehouseName?: string
-  status?: number;
+  status?: number
  remark: string
 }
 export interface positionFormInfo {
-  id?: number;
+  id?: number
-  warehouseId?: number | string;
+  warehouseId?: number | string
-  locationName: string;
+  locationName: string
-  pickingOrder: string;
+  pickingOrder: string
-  locationCode: string;
+  locationCode: string
-  warehouseName: string;
+  warehouseName: string
  remark: string
  status: number
 }
@@ -152,10 +152,10 @@ export function factoryLogWarehouseLog(id: number | string | undefined) {
  )
 }
-export function factoryWarehouseInfoPrint(data:PrintData) {
+export function factoryWarehouseInfoPrint(data: PrintData) {
  return axios.post<never, BaseRespData<LogListData[]>>(
    '/factoryWarehouseInfo/print',
-    data
+    data,
  )
 }
@@ -249,18 +249,24 @@ export function warehouseInRecordListPageApi(
 }
 export function addInRecordApi(form: InRecordEditForm) {
-  return axios.post<never, BaseRespData<never>>('factory/warehouseInRecord/add', {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/warehouseInRecord/add',
+    {
      ...form,
-  })
+    },
+  )
 }
 export function updateInRecordApi(form: InRecordEditForm) {
-  return axios.post<never, BaseRespData<never>>('factory/warehouseInRecord/update', {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/warehouseInRecord/update',
+    {
      ...form,
-  })
+    },
+  )
 }
 export function getWarehouseInRecordDetailApi(id: number) {
-  return axios.get<never, BaseRespData<never>>(
+  return axios.get<never, BaseRespData<InterWarehouseDetail[]>>(
    'factory/warehouseInRecord/get',
    {
      params: {
@@ -280,7 +286,10 @@ export function getBySkuApi(warehouseId: number, sku: string | null) {
    },
  )
 }
-export function getByWareHouseIdAndCodeApi(wareHouseId: number, code: string | null) {
+export function getByWareHouseIdAndCodeApi(
+  wareHouseId: number,
+  code: string | null,
+) {
  return axios.get<never, BaseRespData<ILocation[]>>(
    'factoryWarehouseLocation/getByWareHouseIdAndCode',
    {
@@ -302,6 +311,13 @@ export function getWarehouseListApi() {
    'factoryWarehouseInfo/getAll',
  )
 }
+interface WarehouseParams {
+  id: number
+  dataVersion: number
+}
+export function auditOrderApi(url: string, data: WarehouseParams[]) {
+  return axios.post(url, data)
+}
 export function deleteWarehouseInRecordApi(ids: string) {
  return axios.get<never, BaseRespData<never>>(
    'factory/warehouseInRecord/delete',
@@ -310,6 +326,11 @@ export function deleteWarehouseInRecordApi(ids: string) {
    },
  )
 }
+export function getInRecordLogApi(inRecordId?: number) {
+  return axios.get<never, BaseRespData<LogListData[]>>(
+    `factory/warehouseInRecord/log/${inRecordId}`,
+  )
+}
 // 出库单
 export function getOutRecordStatusTree() {
  return axios.get<never, BaseRespData<InterWarehouseTree[]>>(

--- a/src/components/ImageView.vue
+++ b/src/components/ImageView.vue
 <template>
  <div
-    class="image-view"
    ref="imageViewRef"
+    class="image-view"
    @mouseover="(ev) => mouseoverImg(ev, src)"
    @mouseleave="mouseleaveImg"
  >

--- a/src/types/api/warehouse.ts
+++ b/src/types/api/warehouse.ts
@@ -7,8 +7,23 @@ export interface warehouseSearchForm {
  sku?: string
  warehouseId?: number
 }
-// 主表列表ts,看新增时是不是一样
+export interface InterProductList {
-export interface InterWarehousePage {
+  createTime?: string
+  id?: number
+  inId?: number
+  productNo?: string | null //custom的货号
+  buyStored?: number | null
+  remark?: string | null
+  skuImage?: string
+  skuName?: string
+  costPrice?: number | null
+  totalPrice?: number | null
+  updateTime?: string
+  warehouseSku?: string
+  locationId?: number | null
+  locationCode?: string | null
+}
+export interface InterWarehouseBase {
  id: number
  factoryId?: number
  factoryCode?: string
@@ -16,28 +31,20 @@ export interface InterWarehousePage {
  warehouseName?: string
  inNo?: string
  shipmentNumber?: string
-  skuAmount?: string
+  skuAmount?: number
  total?: number
  totalPrice?: number
  billStatus?: string
-  remark?: string
+  remark?: string | null
-  productList?: InterProductList[]
+  dataVersion?: number
+  createTime?: string | null
+  updateTime?: string | null
 }
-export interface InterWarehouseDetail {
+// 主表列表ts
-  id?: string
+export interface InterWarehousePage extends InterWarehouseBase {}
-  inId?: string
+// 子表列表ts
-  productNo?: string
+export interface InterWarehouseDetail extends InterWarehouseBase {
-  warehouseSku?: string
+  productList: InterProductList[]
-  skuImage?: string
-  skuName?: string
-  buyStored?: string
-  totalPrice?: number
-  rejectsAmount?: string
-  rejectsReason?: string
-  remark?: string
-  factoryId?: number
-  createTime?: string
-  updateTime?: string
 }
 export interface InterWarehouseTree {
  id: number
@@ -49,14 +56,13 @@ export interface InterWarehouseTree {
 }
 export interface InterProductList {
  createTime?: string
-  factoryId?: number
  id?: number
  inId?: number
  productNo?: string | null //货号
  buyStored?: number | null //入库数量
-  rejectsAmount?: number
+  // rejectsAmount?: number
-  rejectsReason?: string
+  // rejectsReason?: string
-  remark?: string
+  remark?: string | null
  skuImage?: string
  skuName?: string
  costPrice?: number | null

--- a/src/utils/hooks/useImagePreview..ts
+++ b/src/utils/hooks/useImagePreview..ts
@@ -10,8 +10,34 @@ export default function useImagePreview() {
  img.style.width = '300px'
  div.appendChild(img)
  document.body.appendChild(div)
+  let currentTarget: HTMLElement | null = null
+  const mousemoveHandler = (ev: MouseEvent) => {
+    if (!currentTarget) return
+    const rect = currentTarget.getBoundingClientRect()
+    const inOrigin =
+      ev.clientX >= rect.left &&
+      ev.clientX <= rect.right &&
+      ev.clientY >= rect.top &&
+      ev.clientY <= rect.bottom
+    const divRect = div.getBoundingClientRect()
+    const inPreview =
+      ev.clientX >= divRect.left &&
+      ev.clientX <= divRect.right &&
+      ev.clientY >= divRect.top &&
+      ev.clientY <= divRect.bottom
+    if (!inOrigin && !inPreview) {
+      div.style.display = 'none'
+      show.value = false
+      window.removeEventListener('mousemove', mousemoveHandler)
+      currentTarget = null
+    }
+  }
  const mouseoverImg = (ev: MouseEvent, url: string) => {
-    console.log(url, ev.clientY, ev.clientX)
    ev.preventDefault()
    if (show.value === true) return
    img.src = url
@@ -30,12 +56,16 @@ export default function useImagePreview() {
      div.style.top = y + 'px'
      div.style.display = 'block'
      show.value = true
+      currentTarget = ev.currentTarget as HTMLElement
+      window.addEventListener('mousemove', mousemoveHandler)
    }
  }
  const mouseleaveImg = () => {
    if (show.value === false) return
    div.style.display = 'none'
    show.value = false
  }
  return { mouseoverImg, mouseleaveImg }
 }
--- a/src/views/warehouse/issueDoc.vue
+++ b/src/views/warehouse/issueDoc.vue
@@ -884,7 +884,7 @@ const {
    warehouseOutRecordListPage(
      {
        ...searchForm.value,
-        // status: nodeId.value === -1 ? null : nodeId.value,
+        billStatus: nodeId.value === -1 ? null : nodeId.value,
        createTimeStart: tradingTime.value && tradingTime.value[0],
        createTimeEnd: tradingTime.value && tradingTime.value[1],
      },

--- a/src/views/warehouse/receiptDoc.vue
+++ b/src/views/warehouse/receiptDoc.vue