From 872fff6d31bb8110f5e83e07bbee23d89aa524e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 14 Dec 2023 19:44:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productputawayJobMain/index.ts | 29 ++++- .../productputawayJobMain/index.vue | 109 ++++++++++++------ .../productputawayJobMain.data.ts | 16 +-- .../productputawayRecordMain.data.ts | 16 +-- 4 files changed, 117 insertions(+), 53 deletions(-) diff --git a/src/api/wms/productputawayJobMain/index.ts b/src/api/wms/productputawayJobMain/index.ts index 6d02a9046..c70270ac4 100644 --- a/src/api/wms/productputawayJobMain/index.ts +++ b/src/api/wms/productputawayJobMain/index.ts @@ -73,10 +73,35 @@ export const deleteProductputawayJobMain = async (id: number) => { // 导出制品上架任务主 Excel export const exportProductputawayJobMain = async (params) => { - return await request.download({ url: `/wms/productputaway-job-main/export-excel`, params }) -} + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/productputaway-job-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/productputaway-job-main/export-excel`, params }) + } +} // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productputaway-job-main/get-import-template' }) +} + +// 承接发料任务 +export const acceptProductputawayMain = async (id) => { + return await request.put({ url: `/wms/productputaway-job-main/accept?id=` + id }) +} + +// 放弃发料任务 +export const abandonProductputawayMain = async (id) => { + return await request.put({ url: `/wms/productputaway-job-main/abandon?id=` + id }) +} + +// 关闭发料任务 +export const closeProductputawayMain = async (id) => { + return await request.put({ url: `/wms/productputaway-job-main/close?id=` + id }) +} + +// 执行发料任务 +export const executeProductputawayMain = async (data) => { + return await request.put({ url: `/wms/productputaway-job-main/execute`, data}) } \ No newline at end of file diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue index 01fba9554..8f4b44d86 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue @@ -90,12 +90,6 @@ const updataTableColumns = (val) => { // 查询列表页面参数设置 const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} ]) // 查询页面返回 @@ -103,29 +97,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + row[formField] = val[0][searchField] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) } }) } -// 子表新增的时候选择表格之后需要会显得字段 -// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] -const Echo = [] const { tableObject, tableMethods } = useTable({ getListApi: ProductputawayJobMainApi.getProductputawayJobMainPage // 分页接口 @@ -140,14 +119,6 @@ const HeadButttondata = [ defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 - // { - // label: '自定义扩展按钮', - // name: 'zdy', - // hide: false, - // type: 'primary', - // icon: 'Select', - // color: '' - // }, ] // 头部按钮事件 @@ -177,20 +148,88 @@ const butttondata = (row) => { defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainJobExe') { // 执行 - console.log('列表-操作按钮事件-执行') + let aaa = { + "id": "1809190000111838147", + "requestNumber": "REC4620231214-0004", + "supplierCode": null, + "fromWarehouseCode": "W1", + "toWarehouseCode": null, + "fromAreaCodes": "", + "toAreaCodes": "", + "fromLocationTypes": "WIP,RAW", + "toLocationTypes": "SEMI,FG", + "completetime": 1702545291000, + "requestTime": 1702524283000, + "requestDueTime": 1689562428000, + "status": "2", + "expiredTime": null, + "updateTime": 1702545291000, + "updater": "1", + "jobStageStatus": null, + "priority": null, + "priorityIncrement": null, + "departmentCode": "103", + "acceptUserId": "1", + "acceptTime": 1702552206000, + "completeUserId": null, + "number": "JOB2220231214-0007", + "businessType": "ProductPutaway", + "remark": "111100", + "createTime": 1702545291000, + "creator": "1", + "autoComplete": "FALSE", + "allowModifyLocation": "FALSE", + "allowModifyQty": "TRUE", + "allowBiggerQty": "TRUE", + "allowSmallerQty": "TRUE", + "allowModifyInventoryStatus": "TRUE", + "allowContinuousScanning": "TRUE", + "allowPartialComplete": "TRUE", + "allowModifyBatch": "FALSE", + "allowModifyPackingNumber": "FALSE", + "inInventoryStatuses": "OK", + "outInventoryStatuses": "OK", + subList: [ + { + "id": "1809190001814017359", + "packingNumber": "12", + "containerNumber": "001", + "batch": "21", + "inventoryStatus": "OK", + "poNumber": null, + "poLine": "item01", + "fromLocationCode": "H03", + "toLocationCode": "L-R-001-002-1-02", + "itemCode": "item01", + "itemName": "物品01", + "itemDesc1": "", + "itemDesc2": "", + "projectCode": "xm01", + "qty": 3, + "uom": "EA", + "number": "JOB2220231214-0007", + "remark": "00", + "createTime": 1702545291000, + "creator": "1", + "fromOwnerCode": null, + "toOwnerCode": null +} + ] + } + ProductputawayJobMainApi.executeProductputawayMain(aaa) } else if (val == 'mainJobAba') { // 放弃 - console.log('列表-操作按钮事件-放弃') + ProductputawayJobMainApi.abandonProductputawayMain(row.id) } else if (val == 'mainJobClo') { // 关闭 - console.log('列表-操作按钮事件-关闭') + ProductputawayJobMainApi.closeProductputawayMain(row.id) } else if (val == 'mainJobAcc') { // 承接 - console.log('列表-操作按钮事件-承接') + ProductputawayJobMainApi.acceptProductputawayMain(row.id) } } diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts index aaa6f46f5..7c85cd959 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts @@ -14,14 +14,14 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '供应商代码', + // field: 'supplierCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts index d2640545f..362f16f89 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts @@ -23,14 +23,14 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '供应商代码', + // field: 'supplierCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '出库事务类型', field: 'outTransactionType',