Browse Source

制品上架 任务

master
陈薪名 12 months ago
parent
commit
872fff6d31
  1. 27
      src/api/wms/productputawayJobMain/index.ts
  2. 109
      src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
  3. 16
      src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
  4. 16
      src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

27
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})
}

109
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)
}
}

16
src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@ -14,14 +14,14 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '供应商代码',
field: 'supplierCode',
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '供应商代码',
// field: 'supplierCode',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '从仓库代码',
field: 'fromWarehouseCode',

16
src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

@ -23,14 +23,14 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true
},
{
label: '供应商代码',
field: 'supplierCode',
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '供应商代码',
// field: 'supplierCode',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '出库事务类型',
field: 'outTransactionType',

Loading…
Cancel
Save