Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/order/podUs/index.vue

src/api/podUsOrder.ts

@@ -12,18 +12,6 @@ import {
 import axios from './axios'
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
 
 
-export interface AddressInfo {
-  id?: string
-  receiverName: string
-  receiverPhone: string
-  receiverCountry: string
-  receiverProvince: string
-  receiverCity: string
-  receiverDistrict: string
-  receiverAddress1: string
-  receiverAddress2: string
-  receiverPostCode: string
-}
 // 同步收货地址
 // 同步收货地址
 export function syncReceiverAddress(data: number[]) {
 export function syncReceiverAddress(data: number[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
@@ -112,7 +100,6 @@ export function updateExceptionOrderApi(data: number[]) {
     },
     },
   )
   )
 }
 }
-
 export function changeExceptionOrderApi(
 export function changeExceptionOrderApi(
   url: string,
   url: string,
   ids: number[],
   ids: number[],
@@ -166,13 +153,13 @@ export function productionQueryApi(id: number, podJomallOrderUsId: number) {
 }
 }
 export function printProductionOrderApi(orderIds: number[]) {
 export function printProductionOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<string>>(
   return axios.post<never, BaseRespData<string>>(
-    'factory/podJomallOrderUs/printProducePdf',
+    'factory/podJomallOrderProductUs/printProducePdf',
     orderIds,
     orderIds,
   )
   )
 }
 }
 export function printPrintOrderApi(orderIds: number[]) {
 export function printPrintOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<string>>(
   return axios.post<never, BaseRespData<string>>(
-    'factory/podJomallOrderUs/printPickPdf',
+    'factory/podJomallOrderProductUs/printPickPdf',
     {
     {
       ids: orderIds.join(','),
       ids: orderIds.join(','),
     },
     },
@@ -180,7 +167,7 @@ export function printPrintOrderApi(orderIds: number[]) {
 }
 }
 export function printPickingOrderApi(orderIds: number[]) {
 export function printPickingOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<string>>(
   return axios.post<never, BaseRespData<string>>(
-    'factory/podJomallOrderUs/pickingComplete',
+    'factory/podJomallOrderProductUs/pickingComplete',
     {
     {
       ids: orderIds.join(','),
       ids: orderIds.join(','),
     },
     },
@@ -280,10 +267,13 @@ export function loadWarehouseListApi() {
     'factoryWarehouseInfo/getAll',
     'factoryWarehouseInfo/getAll',
   )
   )
 }
 }
-export function refreshMaterialApi(orderIds: string) {
+export function refreshMaterialApi(data: {
+  orderIds?: string
+  productIds?: string
+}) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderProductUs/refreshDesignImages ',
     'factory/podJomallOrderProductUs/refreshDesignImages ',
-    { orderIds },
+    data,
   )
   )
 }
 }
 // 获取跟踪号
 // 获取跟踪号
@@ -379,6 +369,28 @@ export function createLogisticsOrdersApi(orderIds: (string | number)[]) {
     orderIds,
     orderIds,
   )
   )
 }
 }
+
+export function applyForReplenishmentApi(
+  data: {
+    id: number
+    productId: number
+    factorySubOrderNumber: string
+    replenishmentNum: string
+    podJomallOrderUsStatus: string
+  }[],
+) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderProductUs/applyForReplenishment`,
+    data,
+  )
+}
+
+export function replenishmentSuccessApi(data: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderProductUs/replenishmentComplete`,
+    data,
+  )
+}
 //确认生产
 //确认生产
 export function confirmProductApi(orderIds: (string | number)[]) {
 export function confirmProductApi(orderIds: (string | number)[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
@@ -393,3 +405,9 @@ export function confirmProductToRiinApi(orderIds: (string | number)[]) {
     orderIds,
     orderIds,
   )
   )
 }
 }
+export function toOutOfStockApi(ids: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/pickingToStockOut`,
+    ids,
+  )
+}

src/types/api/podUsOrder.ts

@@ -19,7 +19,9 @@ export interface SearchForm {
   endTime: string | null
   endTime: string | null
   exceptionHandling: number | undefined
   exceptionHandling: number | undefined
   platform: string
   platform: string
-  productionClient:string
+  productionClient: string
+  warehouseId: string | number
+  thirdSkuCode: string
 }
 }
 export interface PodUsOrderListData {
 export interface PodUsOrderListData {
   id: number
   id: number