Merge branch 'dev'

src/api/podCnOrder.ts

@@ -8,7 +8,7 @@ import {
   WarehouseListData,
   WarehouseListData,
   LogisticsData,
   LogisticsData,
   ExportParams,
   ExportParams,
-  IconfirmSubmit
+  IconfirmSubmit,
 } from '@/types/api/podCnOrder'
 } from '@/types/api/podCnOrder'
 import { InterceptStateGroupData } from '@/types/api/podUsOrder'
 import { InterceptStateGroupData } from '@/types/api/podUsOrder'
 import axios from './axios'
 import axios from './axios'
@@ -354,9 +354,13 @@ export function refreshProductInformationApi(data: {
   )
   )
 }
 }
 // 设计图排版
 // 设计图排版
-export function composingDesignImages(data: number[], type: string) {
+export function composingDesignImages(
+  data: number[],
+  type?: string,
+  templateWidth?: number,
+) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
-    `factory/podJomallOrderCn/composingDesignImages?type=${type}`,
+    `factory/podJomallOrderCn/composingDesignImages?type=${type}&templateWidth=${templateWidth}`,
     data,
     data,
   )
   )
 }
 }
@@ -401,7 +405,7 @@ export function replenishmentSuccessApi(data: number[]) {
   )
   )
 }
 }
 //确认生产
 //确认生产
-export function confirmProductApi(data:IconfirmSubmit) {
+export function confirmProductApi(data: IconfirmSubmit) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     `factory/podJomallOrderCn/confirmProduct`,
     `factory/podJomallOrderCn/confirmProduct`,
     data,
     data,
@@ -415,10 +419,14 @@ export function toOutOfStockApi(ids: number[]) {
 }
 }
 
 
 // 排单完成
 // 排单完成
-export function arrangeFinishApi(ids: number[]) {
+export function arrangeFinishApi(params: {
+  productIdList: number[]
+  templateWidth?: number
+  type?: string
+}) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     `factory/podJomallOrderProductCn/arrangeFinish`,
     `factory/podJomallOrderProductCn/arrangeFinish`,
-    ids,
+    params,
   )
   )
 }
 }
 
 
@@ -461,9 +469,13 @@ export function batchDownloadDeleteApi(params: { ids: string }) {
 }
 }
 
 
 // 批量下载 重新排版
 // 批量下载 重新排版
-export function batchDownloadRecomposingApi(params: { id: number }) {
+export function batchDownloadRecomposingApi(params: {
+  id: number
+  type?: string
+  templateWidth?: number
+}) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
-    `factory/podBatchDownload/reComposingDesignImages`,
+    `factory/podBatchDownload/reCnComposingDesignImages`,
     {
     {
       params,
       params,
     },
     },
@@ -556,3 +568,25 @@ export function uploadExpressSheet(params: {
     params,
     params,
   )
   )
 }
 }
+// 打印拣货单item
+export function printPickPdfByBatchNumberApi(params: {
+  batchArrangeNumber: string
+}) {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderProductCn/printPickPdfByBatchNumber`,
+    {
+      params,
+    },
+  )
+}
+// 打印生产单item
+export function printProductionPdfByBatchNumberApi(params: {
+  batchArrangeNumber: string
+}) {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderProductCn/printProductionPdfByBatchNumber`,
+    {
+      params,
+    },
+  )
+}