Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/productputawayJobDetail/index.ts

@@ -26,6 +26,19 @@ export interface ProductputawayJobDetailVO {
 
 // 查询制品上架任务子列表
 export const getProductputawayJobDetailPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-job-detail/page`, params })
+  }
+}
+
+// 查询制品上架任务子列表
+export const getProductputawayJobDetailPageAssemble = async (params) => {
+    params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}

src/api/wms/productputawayRecordDetail/index.ts

@@ -36,6 +36,7 @@ export interface ProductputawayRecordDetailVO {
 
 // 查询制品上架记录子列表
 export const getProductputawayRecordDetailPage = async (params) => {
+  params.type = 'predict'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -45,6 +46,17 @@ export const getProductputawayRecordDetailPage = async (params) => {
   }
 }
 
+// 查询制品上架记录子列表
+export const getProductputawayRecordDetailPageAssemble = async (params) => {
+    params.type = 'assemble'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-record-detail/page`, params })
+  }
+}
 // 查询制品上架记录子详情
 export const getProductputawayRecordDetail = async (id: number) => {
   return await request.get({ url: `/wms/productputaway-record-detail/get?id=` + id })

src/api/wms/productputawayRequestDetail/index.ts

@@ -27,6 +27,19 @@ export interface ProductputawayRequestDetailVO {
 
 // 查询制品上架申请子列表
 export const getProductputawayRequestDetailPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productputaway-request-detail/page`, params })
+  }
+}
+
+// 查询制品上架申请子列表
+export const getProductputawayRequestDetailPageAssemble = async (params) => {
+    params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}

src/api/wms/productreceiptJobDetail/index.ts

@@ -31,6 +31,19 @@ export interface ProductreceiptJobDetailVO {
 
 // 查询制品收货任务子列表
 export const getProductreceiptJobDetailPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-detail/page`, params })
+  }
+}
+
+// 查询制品收货任务子列表
+export const getProductreceiptJobDetailPageAssemble = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}

src/api/wms/productreceiptRecordDetail/index.ts

@@ -36,6 +36,19 @@ export interface ProductreceiptRecordDetailVO {
 
 // 查询制品收货记录子列表
 export const getProductreceiptRecordDetailPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-detail/page`, params })
+  }
+}
+
+// 查询制品收货记录子列表
+export const getProductreceiptRecordDetailPageAssemble = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}

src/api/wms/productreceiptRequestDetail/index.ts

@@ -32,6 +32,19 @@ export interface ProductreceiptRequestDetailVO {
 
 // 查询制品收货申请子列表
 export const getProductreceiptRequestDetailPage = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-detail/page`, params })
+  }
+}
+
+// 查询制品收货申请子列表
+export const getProductreceiptRequestDetailPageAssemble = async (params) => {
+  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue

@@ -108,7 +108,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductputawayJobDetailApi.getProductputawayJobDetailPage // 分页接口
+  getListApi: ProductputawayJobDetailApi.getProductputawayJobDetailPageAssemble // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue

@@ -85,7 +85,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductputawayRecordDetailApi.getProductputawayRecordDetailPage // 分页接口
+  getListApi: ProductputawayRecordDetailApi.getProductputawayRecordDetailPageAssemble // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue

@@ -141,7 +141,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductputawayRequestDetailApi.getProductputawayRequestDetailPage // 分页接口
+  getListApi: ProductputawayRequestDetailApi.getProductputawayRequestDetailPageAssemble // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue

@@ -109,7 +109,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptJobDetailApi.getProductreceiptJobDetailAssemblePage // 分页接口
+  getListApi: ProductreceiptJobDetailApi.getProductreceiptJobDetailPageAssemble // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -129,7 +129,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage // 分页接口
+  getListApi: ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPageAssemble // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@@ -208,7 +208,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage // 分页接口
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble // 分页接口
 })
 
 // 获得表格的各种操作