diff --git a/.env.wyf b/.env.wyf index b6100e378..7ee319b35 100644 --- a/.env.wyf +++ b/.env.wyf @@ -3,19 +3,77 @@ NODE_ENV=test VITE_DEV=false +# # 达明 +# # # 请求路径 +# VITE_BASE_URL='http://192.168.0.105:12080' +# # 上传路径 +# VITE_UPLOAD_URL='http://192.168.0.105:12080/admin-api/infra/file/upload' + +# # 大哥 # # 请求路径 -# VITE_BASE_URL='http://192.168.0.113:12080' +# VITE_BASE_URL='http://192.168.0.216:12080' +# # 上传路径 +# VITE_UPLOAD_URL='http://192.168.0.216:12080/admin-api/infra/file/upload' + +# # 雪冰 +# # # 请求路径 +# VITE_BASE_URL='http://192.168.1.68:12080' # # 上传路径 -# VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload' +# VITE_UPLOAD_URL='http://192.168.1.68:12080/admin-api/infra/file/upload' +# # 依然 +# # # 请求路径 +# VITE_BASE_URL='http://192.168.1.253:12080' +# # 上传路径 +# VITE_UPLOAD_URL='http://192.168.1.253:12080/admin-api/infra/file/upload' + +# # 国强 # # 请求路径 -# VITE_BASE_URL='https://scp.faway-hella.com/api' +# VITE_BASE_URL='http://192.168.0.106:12080' # # 上传路径 -# VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload' +# VITE_UPLOAD_URL='http:// 192.168.0.106:12080/admin-api/infra/file/upload' + + -# 请求路径 -VITE_BASE_URL='http://172.21.32.13/api' + +# 佳兴 +# # # 请求路径 +# VITE_BASE_URL='http://192.168.1.254:12080' +# # 上传路径 +# VITE_UPLOAD_URL='http://192.168.1.254:12080/admin-api/infra/file/upload' + +# # zb +# VITE_BASE_URL='http://192.168.0.37:12080' +# # 上传路径 +# VITE_UPLOAD_URL='http://192.168.0.37:12080/admin-api/infra/file/upload' + +# 81 WMS请求路径 82 SCP +VITE_BASE_URL='http://172.22.32.9/api' # 上传路径 -VITE_UPLOAD_URL='http://172.21.32.13/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload' + + + +# # 81 WMS请求路径 82 SCP +# VITE_BASE_URL='http://172.21.32.14/api' +# # 上传路径 +# VITE_UPLOAD_URL='http://172.21.32.14/api/admin-api/infra/file/upload' + +# # 请求路径 +# VITE_BASE_URL='https://scptest.faway-hella.com/api' +# # 上传路径 +# VITE_UPLOAD_URL='https://scptest.faway-hella.com/api/admin-api/infra/file/upload' + +# # scptest +# VITE_BASE_URL='http://172.21.32.16/api' +# # 上传路径 +# VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload' + + + +# # 请求路径 +# VITE_BASE_URL='http://172.21.32.13/api' +# # 上传路径 +# VITE_UPLOAD_URL='http://172.21.32.13/api/admin-api/infra/file/upload' # # 请求路径 @@ -55,10 +113,19 @@ VITE_OUT_DIR=sfms3.0 VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080' +VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' # 租户配置 VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 -VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' +VITE_REPORT_URL = 'http://localhost' + +# 登录系统升级的提示 +VITE_SYSTERM_UPDATE_ALERT = false + +# 是否需要验证码 +VITE_NEED_CODE = false + +# 是否需要下载PDA链接 +VITE_PDA_URL = true \ No newline at end of file diff --git a/README.md b/README.md index 2953275d5..cda786aae 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,12 @@ tableForm:{ }] }, - +tableForm: { + type: 'InputNumber', + minField: 0, // 每行数据不同最小值 + precision: 2, + maxField:'maxQty' // 每行数据不同最大值 +} **主子表合并需要修改的代码** 1、影响Table表头 diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 1387a2391..2a2445c38 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -210,6 +210,17 @@ export const getBalanceByQJ = async (params) => { } } +// 查询器具库存余额列表 +export const getBalanceByQJToScrap = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/seniorContainerToScrap', data }) + } else { + return await request.get({ url: `/wms/balance/pageContainerToScrap`, params }) + } +} + // 查询库存余额列表根据业务类型 根据库存状态及库区类型筛选 export const getBalanceByBusinessTypeByItemType = async (params) => { diff --git a/src/api/wms/balanceChangeHistory/index.ts b/src/api/wms/balanceChangeHistory/index.ts new file mode 100644 index 000000000..0d66d2c2d --- /dev/null +++ b/src/api/wms/balanceChangeHistory/index.ts @@ -0,0 +1,62 @@ +import request from '@/config/axios' + +export interface BalanceChangeHistoryVO { + beforeItemCode: string + beforeBatch: string + beforePackingNumber: string + beforeInventoryStatus: string + beforeLocationCode: string + beforeQty: number + beforeTransNumber: string + beforeId: number + afterItemCode: string + afterBatch: string + afterPackingNumber: string + afterInventoryStatus: string + afterLocationCode: string + afterQty: number + afterTransNumber: string + afterId: number + remark: string +} + +// 查询库存余额变更记录列表 +export const getBalanceChangeHistoryPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance-change-history/senior', data }) + } else { + return await request.get({ url: `/wms/balance-change-history/page`, params }) + } +} + +// 查询库存余额变更记录详情 +export const getBalanceChangeHistory = async (id: number) => { + return await request.get({ url: `/wms/balance-change-history/get?id=` + id }) +} + +// 新增库存余额变更记录 +export const createBalanceChangeHistory = async (data: BalanceChangeHistoryVO) => { + return await request.post({ url: `/wms/balance-change-history/create`, data }) +} + +// 修改库存余额变更记录 +export const updateBalanceChangeHistory = async (data: BalanceChangeHistoryVO) => { + return await request.put({ url: `/wms/balance-change-history/update`, data }) +} + +// 删除库存余额变更记录 +export const deleteBalanceChangeHistory = async (id: number) => { + return await request.delete({ url: `/wms/balance-change-history/delete?id=` + id }) +} + +// 导出库存余额变更记录 Excel +export const exportBalanceChangeHistory = async (params) => { + return await request.download({ url: `/wms/balance-change-history/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/balance-change-history/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/bomDismantle/index.ts b/src/api/wms/bomDismantle/index.ts index 981af0fdb..99b3050d8 100644 --- a/src/api/wms/bomDismantle/index.ts +++ b/src/api/wms/bomDismantle/index.ts @@ -41,6 +41,10 @@ export const getProductscrapBomRecordPageBatch = async (params1) => { } } +export const getChangeBomQtyPage = async (params) => { + return await request.get({ url: `/wms/productscrap-request-main/pageBom`, params }) +} + // 查询制品报废申请子列表 export const getProductscrapBomDismantleRecordPage = async (params) => { return await request.get({ url: `/wms/productscrap-record-main/bomPage`, params }) diff --git a/src/api/wms/containerMainRequest/index.ts b/src/api/wms/containerMainRequest/index.ts index 681b93c3e..3544598de 100644 --- a/src/api/wms/containerMainRequest/index.ts +++ b/src/api/wms/containerMainRequest/index.ts @@ -113,14 +113,30 @@ export const exportDeliverContainerMainRequest = async (params) => { } } -// 下载用户导入模板(器具初始化/新增) -export const importTemplate = () => { - return request.download({ url: '/wms/container-main-request/get-import-template' }) + +// 下载用户导入模板(器具初始化) +export const importTemplateInitial = () => { + return request.download({ url: '/wms/container-main-request/get-import-template-initial' }) +} +// 下载用户导入模板(器具新增) +export const importTemplateCreate = () => { + return request.download({ url: '/wms/container-main-request/get-import-template-create' }) +} + +// 下载用户导入模板(器具报废) +export const importTemplateScrap = () => { + return request.download({ url: '/wms/container-main-request/get-import-template-scrap' }) } -// 下载用户导入模板(器具返回/移动/报废) -export const importTemplateReturnAndMove = () => { - return request.download({ url: '/wms/container-main-request/get-import-template-returnAndMove' }) +// 下载用户导入模板(器具移动) +export const importTemplateMove = () => { + return request.download({ url: '/wms/container-main-request/get-import-template-move' }) +} + + +// 下载用户导入模板(器具返回) +export const importTemplateReturn = () => { + return request.download({ url: '/wms/container-main-request/get-import-template-return' }) } // 关闭 diff --git a/src/api/wms/containerRecordMain/index.ts b/src/api/wms/containerRecordMain/index.ts index 044e9d8ba..34ea53f97 100644 --- a/src/api/wms/containerRecordMain/index.ts +++ b/src/api/wms/containerRecordMain/index.ts @@ -58,7 +58,8 @@ export const exportContainerRecordMain = async (params) => { } // 导出器具管理初始化记录主 Excel -export const exportContainerInitRecordMain = async (params) => { +export const exportContainerInitialRecordMain = async (params) => { + params.businessType = 'InitialContainerManage' if (params.isSearch) { delete params.isSearch const data = { ...params } @@ -68,6 +69,66 @@ export const exportContainerInitRecordMain = async (params) => { } } +// 导出器具管理创建记录主 Excel +export const exportContainerCreateRecordMain = async (params) => { + params.businessType = 'CreateContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.downloadPost({ url: '/wms/container-record-main/export-excel-init-senior', data }) + } else { + return await request.download({ url: `/wms/container-record-main/export-excel-init`, params }) + } +} + +// 导出器具管理返回记录主 Excel +export const exportContainerReturnRecordMain = async (params) => { + params.businessType = 'CreateContainerManage' +if (params.isSearch) { +delete params.isSearch +const data = { ...params } +return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data }) +} else { +return await request.download({ url: `/wms/container-record-main/export-excel`, params }) +} +} + +// 导出器具管理移动记录主 Excel +export const exportContainerMoveRecordMain = async (params) => { + params.businessType = 'MoveContainerManage' +if (params.isSearch) { +delete params.isSearch +const data = { ...params } +return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data }) +} else { +return await request.download({ url: `/wms/container-record-main/export-excel`, params }) +} +} + +// 导出器具管理报废记录主 Excel +export const exportContainerScrapRecordMain = async (params) => { + params.businessType = 'ScrapContainerManage' +if (params.isSearch) { +delete params.isSearch +const data = { ...params } +return await request.downloadPost({ url: '/wms/container-record-main/export-excel-scrap-senior', data }) +} else { +return await request.download({ url: `/wms/container-record-main/export-excel-scrap`, params }) +} +} + +// 导出器具管理发运记录主 Excel +export const exportContainerDeliverRecordMain = async (params) => { + params.businessType = 'DeliverContainerManage' +if (params.isSearch) { +delete params.isSearch +const data = { ...params } +return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data }) +} else { +return await request.download({ url: `/wms/container-record-main/export-excel`, params }) +} +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/container-record-main/get-import-template' }) diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index d851c3104..43e70a492 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -86,7 +86,10 @@ export const exportCountJobMain = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/count-job-main/get-import-template' }) } - +// 下载用户导入模板 +export const lineTypeImportTemplate = () => { + return request.download({ url: '/wms/count-job-main/get-lineTypeImport-template' }) +} // 关闭盘点任务主 export const closeCountJobMain = (id: number) => { return request.put({ url: '/wms/count-job-main/close?id=' + id }) diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts index cbb7bfb59..819fdc475 100644 --- a/src/api/wms/demandforecastingMain/index.ts +++ b/src/api/wms/demandforecastingMain/index.ts @@ -149,6 +149,14 @@ export const queryUserPlanerList = async () => { export const querySupplierList = async (data) => { return await request.post({ url: `/wms/demandforecasting-main/querySupplierList`,data }) } +// 供应商代码 +export const queryQadSupplierList = async (data) => { + return await request.post({ url: `/wms/demandforecasting-main/queryQadSupplierList`,data }) +} +// 物料代码 +export const queryQadItemCodeList = async (data) => { + return await request.post({ url: `/wms/demandforecasting-main/queryQadItemCodeList`,data }) +} // 是否已读接口 @@ -156,4 +164,10 @@ export const updateIsRead = async (data) => { return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data }) } +//更新要货预测 +export const updateDemandforecaste = async (data) => { + return await request.post({ url: `/wms/demandforecasting-detail/queryQADDemandforecasting`,data }) +} + + diff --git a/src/api/wms/issueJobMain/index.ts b/src/api/wms/issueJobMain/index.ts index 0ae3e11c7..a8b182862 100644 --- a/src/api/wms/issueJobMain/index.ts +++ b/src/api/wms/issueJobMain/index.ts @@ -107,4 +107,7 @@ export const executeIssueMain = async (data) => { return await request.put({ url: `/wms/issue-job-main/execute`, data}) } - +// 更新任务配置 +export const updateIssueJobConfig = () => { + return request.put({ url: '/wms/issue-job-main/updateIssueJobConfig'}) +} \ No newline at end of file diff --git a/src/api/wms/notPackageTransactionBalance/index.ts b/src/api/wms/notPackageTransactionBalance/index.ts new file mode 100644 index 000000000..8cf84cfa6 --- /dev/null +++ b/src/api/wms/notPackageTransactionBalance/index.ts @@ -0,0 +1,54 @@ +import request from '@/config/axios' + +export interface NotPackageTransactionBalanceVO { + id: number + itemCode: string + locationCode: string + batch: string + cnt: string + sumQtyTransaction: number + sumQtyBalance: number + differenceQty: number + remark: string +} + +// 查询对账_无包装事务余额对数结果列表 +export const getNotPackageTransactionBalancePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/not-package-transaction-balance/senior', data }) + } else { + return await request.get({ url: `/wms/not-package-transaction-balance/page`, params }) + } +} + +// 查询对账_无包装事务余额对数结果详情 +export const getNotPackageTransactionBalance = async (id: number) => { + return await request.get({ url: `/wms/not-package-transaction-balance/get?id=` + id }) +} + +// 新增对账_无包装事务余额对数结果 +export const createNotPackageTransactionBalance = async (data: NotPackageTransactionBalanceVO) => { + return await request.post({ url: `/wms/not-package-transaction-balance/create`, data }) +} + +// 修改对账_无包装事务余额对数结果 +export const updateNotPackageTransactionBalance = async (data: NotPackageTransactionBalanceVO) => { + return await request.put({ url: `/wms/not-package-transaction-balance/update`, data }) +} + +// 删除对账_无包装事务余额对数结果 +export const deleteNotPackageTransactionBalance = async (id: number) => { + return await request.delete({ url: `/wms/not-package-transaction-balance/delete?id=` + id }) +} + +// 导出对账_无包装事务余额对数结果 Excel +export const exportNotPackageTransactionBalance = async (params) => { + return await request.download({ url: `/wms/not-package-transaction-balance/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/not-package-transaction-balance/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/productionreceiptJobMain/index.ts b/src/api/wms/productionreceiptJobMain/index.ts index 34c3e07bf..38c5fad1e 100644 --- a/src/api/wms/productionreceiptJobMain/index.ts +++ b/src/api/wms/productionreceiptJobMain/index.ts @@ -105,4 +105,9 @@ export const closeIssueMain = async (id) => { // 执行发料任务 export const executeIssueMain = async (data) => { return await request.put({ url: `/wms/productionreceipt-job-main/execute`, data}) +} + +// 更新任务配置 +export const updateProductionreceiptJobConfig = () => { + return request.put({ url: '/wms/productionreceipt-job-main/updateProductionreceiptJobConfig'}) } \ No newline at end of file diff --git a/src/api/wms/productionreturnJobMain/index.ts b/src/api/wms/productionreturnJobMain/index.ts index 74bd69d6f..f4e9e2c43 100644 --- a/src/api/wms/productionreturnJobMain/index.ts +++ b/src/api/wms/productionreturnJobMain/index.ts @@ -125,4 +125,14 @@ export const closeProductionreturnMain = async (id) => { // 执行发料任务 export const executeProductionreturnMain = async (data) => { return await request.put({ url: `/wms/productionreturn-job-main/execute`, data}) +} + +// 更新任务配置 +export const updateProductionreturnJobConfig = () => { + return request.put({ url: '/wms/productionreturn-job-main/updateProductionreturnJobConfig'}) +} + +// 更新任务配置-隔离收货任务 +export const updateProductionreturnJobHoldConfig = () => { + return request.put({ url: '/wms/productionreturn-job-main/updateProductionreturnJobHoldConfig'}) } \ No newline at end of file diff --git a/src/api/wms/productputawayJobMain/index.ts b/src/api/wms/productputawayJobMain/index.ts index d9379684f..657ab6f95 100644 --- a/src/api/wms/productputawayJobMain/index.ts +++ b/src/api/wms/productputawayJobMain/index.ts @@ -129,4 +129,14 @@ export const closeProductputawayMain = async (id) => { // 执行发料任务 export const executeProductputawayMain = async (data) => { return await request.put({ url: `/wms/productputaway-job-main/execute`, data}) -} \ No newline at end of file +} + +// 更新任务配置 +export const updateProductputawayJobConfig = () => { + return request.put({ url: '/wms/productputaway-job-main/updateProductputawayJobConfig'}) +} + +// 更新任务配置装配 +export const updateProductputawayJobAssembleConfig = () => { + return request.put({ url: '/wms/productputaway-job-main/updateProductputawayJobAssembleConfig'}) +} diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts index 91f9d4e90..d73319812 100644 --- a/src/api/wms/productreceiptJobMain/index.ts +++ b/src/api/wms/productreceiptJobMain/index.ts @@ -163,3 +163,18 @@ export const closeProductreceiptMain = async (id) => { export const executeProductreceiptMain = async (data) => { return await request.put({ url: `/wms/productreceipt-job-main/execute`, data}) } + +// 更新任务配置 +export const updateProductreceiptJobConfig = () => { + return request.put({ url: '/wms/productreceipt-job-main/updateProductreceiptJobConfig'}) +} + +// 更新任务配置 +export const updateProductreceiptJobAssembleConfig = () => { + return request.put({ url: '/wms/productreceipt-job-main/updateProductreceiptJobAssembleConfig'}) +} + +// 更新任务配置 +export const updateProductreceiptScrapJobConfig = () => { + return request.put({ url: '/wms/productreceipt-job-main/updateProductreceiptScrapJobConfig'}) +} diff --git a/src/api/wms/productredressJobMain/index.ts b/src/api/wms/productredressJobMain/index.ts index 8e90c034c..3c0570c36 100644 --- a/src/api/wms/productredressJobMain/index.ts +++ b/src/api/wms/productredressJobMain/index.ts @@ -102,3 +102,8 @@ export const exportProductredressJobMain = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/productredress-job-main/get-import-template' }) } + +// 更新任务配置 +export const updateProductredressJobConfig = () => { + return request.put({ url: '/wms/productredress-job-main/updateProductredressJobConfig'}) +} \ No newline at end of file diff --git a/src/api/wms/productscrapRequestMain/index.ts b/src/api/wms/productscrapRequestMain/index.ts index 2a0a38edd..f003dc322 100644 --- a/src/api/wms/productscrapRequestMain/index.ts +++ b/src/api/wms/productscrapRequestMain/index.ts @@ -103,6 +103,12 @@ export const updateProductscrapDetailRequestBom = async (id, data) => { return await request.post({ url: `/wms/productscrap-request-main/updateBom?id=`+id, data }) } + +// 修改制品报废BOM数据 +export const updateChangeBomRequest = async (data) => { + return await request.post({ url: `/wms/productscrap-request-main/updateBomQty`, data }) +} + // 编辑 export const editReturnNew = async (params) => { return await request.get({ url: `/wms/productscrap-request-main/editReturnNew`, params }) diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts index 4623e6fea..842604d0e 100644 --- a/src/api/wms/purchaseDetail/index.ts +++ b/src/api/wms/purchaseDetail/index.ts @@ -47,8 +47,8 @@ export const getPurchaseDetailPage = async (params) => { // 查询采购订单子列表 export const getPurchaseDetailPageWMS = async (params) => { if (params.isSearch) { - delete params.isSearch const data = {...params} + delete data.isSearch return await request.post({ url: '/wms/purchase-detail/seniorWMS', data }) } else { return await request.get({ url: `/wms/purchase-detail/pageWMS`, params }) @@ -56,11 +56,23 @@ export const getPurchaseDetailPageWMS = async (params) => { } +// 查询采购订单子列表 +export const getPurchaseDetailPageWMSPurchasereceiptRequest = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchase-detail/purchasereceiptRequestSeniorWMS', data }) + } else { + return await request.get({ url: `/wms/purchase-detail/purchasereceiptRequestPageWMS`, params }) + } +} + + // 查询M类型的采购订单子列表 export const getPurchaseDetailPageWMSMOrderType = async (params) => { if (params.isSearch) { - delete params.isSearch const data = {...params} + delete data.isSearch return await request.post({ url: '/wms/purchase-detail/seniorWMS-MOrderType', data }) } else { return await request.get({ url: `/wms/purchase-detail/pageWMS-MOrderType`, params }) @@ -69,8 +81,8 @@ export const getPurchaseDetailPageWMSMOrderType = async (params) => { export const getPurchaseDetailPageWMSTypeM = async (params) => { if (params.isSearch) { - delete params.isSearch const data = {...params} + delete data.isSearch return await request.post({ url: '/wms/purchase-detail/seniorM', data }) } else { return await request.get({ url: `/wms/purchase-detail/pageM`, params }) @@ -80,8 +92,8 @@ export const getPurchaseDetailPageWMSTypeM = async (params) => { // 查询采购订单子列表 export const getPurchaseDetailPageWMSSpare = async (params) => { if (params.isSearch) { - delete params.isSearch const data = {...params} + delete data.isSearch return await request.post({ url: '/wms/purchase-detail/seniorWMS-Spare', data }) } else { return await request.get({ url: `/wms/purchase-detail/pageWMS-Spare`, params }) diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 79e546090..f024ded64 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -139,3 +139,13 @@ export const acceptPurchasereceiptJobMain = (id: number) => { export const refusalPurchasereceiptJobMain = (data) => { return request.post({ url: '/wms/purchasereceipt-job-main/refusal',data}) } + +// 更新任务配置 +export const updatePurchasereceiptJobConfig = () => { + return request.put({ url: '/wms/purchasereceipt-job-main/updatePurchasereceiptJobConfig'}) +} + +// 维修备件更新任务配置 +export const updatePurchasereceiptJobConfigSpare = () => { + return request.put({ url: '/wms/purchasereceipt-job-main/updatePurchasereceiptJobConfigSpare'}) +} \ No newline at end of file diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts index d452888a3..fbce68aa0 100644 --- a/src/api/wms/purchasereturnJobMain/index.ts +++ b/src/api/wms/purchasereturnJobMain/index.ts @@ -106,3 +106,8 @@ export const acceptPurchasereturnJobMain = (id: number) => { export const abandonPurchasereturnJobMain = (id: number) => { return request.put({ url: '/wms/purchasereturn-job-main/abandon?id=' + id }) } + +// 更新任务配置 +export const updatePurchasereturnJobConfig = () => { + return request.put({ url: '/wms/purchasereturn-job-main/updatePurchasereturnJobConfig'}) +} \ No newline at end of file diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts index b6fb266d8..3b3c1a496 100644 --- a/src/api/wms/putawayJobMain/index.ts +++ b/src/api/wms/putawayJobMain/index.ts @@ -101,3 +101,8 @@ export const acceptPutawayJobMain = (id: number) => { export const abandonPutawayJobMain = (id: number) => { return request.put({ url: '/wms/putaway-job-main/abandon?id=' + id }) } + +// 更新任务配置 +export const updatePutawayJobMConfig = () => { + return request.put({ url: '/wms/putaway-job-main/updatePutawayJobConfig'}) +} \ No newline at end of file diff --git a/src/api/wms/repleinshJobMain/index.ts b/src/api/wms/repleinshJobMain/index.ts index 2869a7745..0485bb27b 100644 --- a/src/api/wms/repleinshJobMain/index.ts +++ b/src/api/wms/repleinshJobMain/index.ts @@ -103,4 +103,9 @@ export const closeRepleinshMain = async (id) => { // 执行发料任务 export const executeRepleinshMain = async (data) => { return await request.put({ url: `/wms/repleinsh-job-main/execute`, data}) +} + +// 更新任务配置 +export const updateRepleinshJobConfig = () => { + return request.put({ url: '/wms/repleinsh-job-main/updateRepleinshJobConfig'}) } \ No newline at end of file diff --git a/src/api/wms/rule/index.ts b/src/api/wms/rule/index.ts index a6fe74970..2fd735970 100644 --- a/src/api/wms/rule/index.ts +++ b/src/api/wms/rule/index.ts @@ -56,3 +56,8 @@ export const exportRule = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/rule/get-import-template' }) } +// 查询规则详情 +export const getMaxPriority = async (code: number) => { + return await request.get({ url: `/wms/rule/getMaxPriority?code=` + code }) +} + diff --git a/src/api/wms/spareitemLocation/index.ts b/src/api/wms/spareitemLocation/index.ts new file mode 100644 index 000000000..053b7b10f --- /dev/null +++ b/src/api/wms/spareitemLocation/index.ts @@ -0,0 +1,59 @@ +import request from '@/config/axios' + +export interface SpareitemLocationVO { + itemCode: string + name: string + desc1: string + desc2: string + locationCode: string + locationName: string + available: string + remark: string +} + +// 查询维修备件默认库位列表 +export const getSpareitemLocationPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/spareitem-location/senior', data }) + } else { + return await request.get({ url: `/wms/spareitem-location/page`, params }) + } +} + +// 查询维修备件默认库位详情 +export const getSpareitemLocation = async (id: number) => { + return await request.get({ url: `/wms/spareitem-location/get?id=` + id }) +} + +// 新增维修备件默认库位 +export const createSpareitemLocation = async (data: SpareitemLocationVO) => { + return await request.post({ url: `/wms/spareitem-location/create`, data }) +} + +// 修改维修备件默认库位 +export const updateSpareitemLocation = async (data: SpareitemLocationVO) => { + return await request.put({ url: `/wms/spareitem-location/update`, data }) +} + +// 删除维修备件默认库位 +export const deleteSpareitemLocation = async (id: number) => { + return await request.delete({ url: `/wms/spareitem-location/delete?id=` + id }) +} + +// 导出维修备件默认库位 Excel +export const exportSpareitemLocation = async (params) => { + return await request.download({ url: `/wms/spareitem-location/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/spareitem-location/get-import-template' }) +} + + +// 自动推荐库位 +export const queryItemLocation = async (data) => { + return await request.post({ url: `/wms/spareitem-location/queryItemLocation`, data }) +} diff --git a/src/api/wms/supplierApbalanceCalendar/index.ts b/src/api/wms/supplierApbalanceCalendar/index.ts new file mode 100644 index 000000000..19836c294 --- /dev/null +++ b/src/api/wms/supplierApbalanceCalendar/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +export interface SupplierApbalanceCalendarVO { + id: number + beginMonth: string + beginDay: string + endMonth: string + endDay: string + descriiption: string + available: string + remark: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询询证函日历列表 +export const getSupplierApbalanceCalendarPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplier-apbalance-calendar/senior', data }) + } else { + return await request.get({ url: `/wms/supplier-apbalance-calendar/page`, params }) + } +} + +// 查询询证函日历详情 +export const getSupplierApbalanceCalendar = async (id: number) => { + return await request.get({ url: `/wms/supplier-apbalance-calendar/get?id=` + id }) +} + +// 新增询证函日历 +export const createSupplierApbalanceCalendar = async (data: SupplierApbalanceCalendarVO) => { + return await request.post({ url: `/wms/supplier-apbalance-calendar/create`, data }) +} + +// 修改询证函日历 +export const updateSupplierApbalanceCalendar = async (data: SupplierApbalanceCalendarVO) => { + return await request.put({ url: `/wms/supplier-apbalance-calendar/update`, data }) +} + +// 删除询证函日历 +export const deleteSupplierApbalanceCalendar = async (id: number) => { + return await request.delete({ url: `/wms/supplier-apbalance-calendar/delete?id=` + id }) +} + +// 导出询证函日历 Excel +export const exportSupplierApbalanceCalendar = async (params) => { + return await request.download({ url: `/wms/supplier-apbalance-calendar/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplier-apbalance-calendar/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/supplierApbalanceMain/index.ts b/src/api/wms/supplierApbalanceMain/index.ts index ed7e2f60c..e1f105182 100644 --- a/src/api/wms/supplierApbalanceMain/index.ts +++ b/src/api/wms/supplierApbalanceMain/index.ts @@ -70,3 +70,15 @@ export const exportSupplierApbalanceMain = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/supplier-apbalance-main/get-import-template' }) } + + +// 查询年月日 +export const getMonthDay = async () => { + return await request.get({ url: `/wms/supplier-apbalance-calendar/getMonthDay`}) +} + + +// 查询供应商余额明细主列表 +export const confirmationPage = async (params) => { + return await request.get({ url: `/wms/supplier-apbalance-main/confirmationPage`, params }) +} \ No newline at end of file diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index f4d4a7b20..55e68a727 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -129,4 +129,11 @@ export const deleteOldLabels = async (id) => { // 查看履历表 export const querySupplierResume = (asnNumber:string) => { return request.get({ url: `/wms/supplierdeliver-request-main/querySupplierResume?asnNumber=` + asnNumber }) -} \ No newline at end of file +} + + +// 校验是否上传成功 +export const checkUploadFileData = async (data) => { + return await request.post({ url: `/infra/file/uploadFileData`,data}) +} + diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts index 2271cdf16..b6a93d12c 100644 --- a/src/api/wms/supplierinvoiceInvoiced/index.ts +++ b/src/api/wms/supplierinvoiceInvoiced/index.ts @@ -45,6 +45,12 @@ export const getSupplierinvoiceInvoicedPageDiscrete = async (params) => { } } +// 查询待开票被删除列表--日程/离散 +export const getSupplierinvoiceInvoicedPageScheduleDeleted = async (params) => { + return await request.get({ url: `/wms/supplierinvoice-invoiced/deletedPage`, params }) +} + + // 查询待开票详情 export const getSupplierinvoiceInvoiced = async (id: number) => { @@ -68,13 +74,25 @@ export const deleteSupplierinvoiceInvoiced = async (id: number) => { // 导出待开票 Excel export const exportSupplierinvoiceInvoicedSchedule = async (params) => { - return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-schedule`, params }) + + + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/supplierinvoice-invoiced/export-excel-schedule-senior`, data }) + }else{ + return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-schedule`, params }) + } } // 导出待开票 Excel export const exportSupplierinvoiceInvoicedDiscrete = async (params) => { - return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-discrete`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/supplierinvoice-invoiced/export-excel-discrete-senior`, data }) + }else{ + return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-discrete`, params }) + } } // 下载用户导入模板 @@ -90,4 +108,10 @@ export const agreeSupplierinvoiceInvoiced = async (id: number) => { // 审批拒绝待开票 export const refuseSupplierinvoiceInvoiced = async (id: number) => { return await request.post({ url: `/wms/supplierinvoice-invoiced/refuse?id=` + id }) +} + + +// 恢复被删除的待开票 +export const receverySupplierinvoiceInvoiced = async (id: number) => { + return await request.post({ url: `/wms/supplierinvoice-invoiced/recevery?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/transaction/index.ts b/src/api/wms/transaction/index.ts index 1581755c6..14d04ad5a 100644 --- a/src/api/wms/transaction/index.ts +++ b/src/api/wms/transaction/index.ts @@ -60,11 +60,22 @@ export const deleteTransaction = async (id: number) => { return await request.delete({ url: `/wms/transaction/delete?id=` + id }) } +// 导出库存事务 Excel +export const checkExportTransaction = async (params) => { + if (params.isSearch) { + const data = {...params} + delete data.isSearch + return await request.post({ url: '/wms/transaction/export-excel-senior-checkCnt', data }) + } else { + return await request.get({ url: `/wms/transaction/export-excel-checkCnt`, params }) + } +} + // 导出库存事务 Excel export const exportTransaction = async (params) => { if (params.isSearch) { - delete params.isSearch const data = {...params} + delete data.isSearch return await request.downloadPost({ url: '/wms/transaction/export-excel-senior', data }) } else { return await request.download({ url: `/wms/transaction/export-excel`, params }) diff --git a/src/api/wms/transactionBalancePackage/index.ts b/src/api/wms/transactionBalancePackage/index.ts new file mode 100644 index 000000000..4711c9be1 --- /dev/null +++ b/src/api/wms/transactionBalancePackage/index.ts @@ -0,0 +1,55 @@ +import request from '@/config/axios' + +export interface TransactionBalancePackageVO { + id: number + packingNumber: string + itemCode: string + batch: string + locationCode: string + inventoryStatusTransaction: string + inventoryStatusBalance: string + qtyTransaction: number + qtyBalance: number + qtyDiff: number +} + +// 查询对账_包装号的事务汇总与余额的差异列表 +export const getTransactionBalancePackagePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/transaction-balance-package/senior', data }) + } else { + return await request.get({ url: `/wms/transaction-balance-package/page`, params }) + } +} + +// 查询对账_包装号的事务汇总与余额的差异详情 +export const getTransactionBalancePackage = async (id: number) => { + return await request.get({ url: `/wms/transaction-balance-package/get?id=` + id }) +} + +// 新增对账_包装号的事务汇总与余额的差异 +export const createTransactionBalancePackage = async (data: TransactionBalancePackageVO) => { + return await request.post({ url: `/wms/transaction-balance-package/create`, data }) +} + +// 修改对账_包装号的事务汇总与余额的差异 +export const updateTransactionBalancePackage = async (data: TransactionBalancePackageVO) => { + return await request.put({ url: `/wms/transaction-balance-package/update`, data }) +} + +// 删除对账_包装号的事务汇总与余额的差异 +export const deleteTransactionBalancePackage = async (id: number) => { + return await request.delete({ url: `/wms/transaction-balance-package/delete?id=` + id }) +} + +// 导出对账_包装号的事务汇总与余额的差异 Excel +export const exportTransactionBalancePackage = async (params) => { + return await request.download({ url: `/wms/transaction-balance-package/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/transaction-balance-package/get-import-template' }) +} \ No newline at end of file diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index b64bcfa90..ee1c122d8 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -3,7 +3,7 @@
- @@ -36,6 +36,9 @@ import UploadFile from '@/components/UploadFile/src/UploadFile.vue' import { formatDate } from '@/utils/formatTime' import * as FileApi from '@/api/wms/file' import { getBaseUrl } from '@/utils/systemParam' +import { getUploadUrl } from '@/utils/systemParam' +import { func } from 'vue-types' + const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 defineComponent({ @@ -83,6 +86,16 @@ const props = defineProps({ type: Boolean, default: true }, + updateUrl:{ + type: String, + required: false, + default: getUploadUrl() + }, + checkUploadUrl:{ + type: Function, + required: false, + default: null + } }) // 子传父的时候需要先定义好emit这个方法 const emit = defineEmits(['handleAnnexSuccess', 'deleteAnnexSuccess','previewAnnexHandle']) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index c825bccf4..fbc4bb175 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -281,7 +281,7 @@ const props = defineProps({ }, //是否可以编辑子表 updateTypeEdiltSubList: { - type: String, + type: Boolean, required: false, default: false }, @@ -808,7 +808,7 @@ const submitForm = async () => { const validateForm = await tableFormRef.value.validateForm() if (!validateForm && props.tableFormDataLength) { if (props.tableData.length == 0) { - message.warning('请填写明细信息！') + message.warning(t(`ts.${'请填写明细信息！'}`)) formLoading.value = false return } diff --git a/src/components/ConfigGlobal/src/ConfigGlobal.vue b/src/components/ConfigGlobal/src/ConfigGlobal.vue index a08739674..2f313d42c 100644 --- a/src/components/ConfigGlobal/src/ConfigGlobal.vue +++ b/src/components/ConfigGlobal/src/ConfigGlobal.vue @@ -54,7 +54,7 @@ const currentLocale = computed(() => localeStore.currentLocale) @@ -143,7 +143,7 @@ @click=" removeX(scope.row, scope.$index, item, index, scope1.row, scope1.$index) " - >移出{{ t('ts.移出') }} diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index 81f58b97d..1fbda34ed 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -273,6 +273,14 @@ const reset = async () => { emit('reset', model) } +const getSearchFormData = async () => { + await unref(elFormRef)?.validate() + const { getFormData } = methods + const model = await getFormData() + console.log(model) + return model +} + const bottonButtonStyle = computed(() => { return { textAlign: props.buttomPosition as unknown as 'left' | 'center' | 'right' @@ -293,7 +301,7 @@ const onBlur = async (field, e) => { } const Search = ref() onMounted(() => {}) -defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗 +defineExpose({setFormValues,search,getSearchFormData}) // 提供 open 方法，用于打开弹窗 @@ -319,6 +327,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗 >