diff --git a/pages/home/home.vue b/pages/home/home.vue index 5f655b6..7a851e6 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -32,7 +32,7 @@ return { userName: '', menuList: [ - {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/manage/man-group-disk'}, + {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/equip-inspection'}, {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/manage/man-group-disk'}, {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/manage/man-group-disk'} ] diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png index 1bc47ed..796026f 100644 Binary files a/static/image/menu/RF03.png and b/static/image/menu/RF03.png differ diff --git a/utils/getData2.js b/utils/getData2.js index 939aad5..b2ba1a4 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -23,56 +23,15 @@ export const handLogin = (user, password) => request({ }) /** - * 设备点检 + * 人工排产 */ -// 获取设备下拉框 -export const deviceInfo = () => request({ - url:'api/pda/deviceCheck/deviceInfo', - data: {} -}) -// 获取设备状态下拉框 -export const deviceStatus = () => request({ - url:'api/pda/deviceCheck/deviceStatus', - data: {} -}) -// 设备点检 -export const deviceCheckVerify = (code, user, remark, status) => request({ - url:'api/pda/deviceCheck/verify', - data: { - device_code: code, - username: user, - remark: remark, - check_status: status - } -}) - -/** - * 强制静置 - */ -// 显示静置信息 -export const forcedRestingShow = () => request({ - url:'api/pda/forcedResting/show', - data: {} -}) -// 强制静置 -export const forcedRestingSubmit = (stime, id) => request({ - url:'api/pda/forcedResting/submit', - data: { - stand_time: stime, - group_id: id - } -}) - -/** - * 分拣排产 - */ -// 显示工单/刷新 +// 工单 export const manualSortingOrders = () => request({ url:'api/pda/manualSorting/orders', data: {} }) // 开工 -export const manualSortingProductionScheduling = (code, user) => request({ +export const productionScheduling = (code, user) => request({ url:'api/pda/manualSorting/productionScheduling', data: { workorder_code: code, @@ -80,7 +39,7 @@ export const manualSortingProductionScheduling = (code, user) => request({ } }) // 完工 -export const manualSortingProductionComplete = (code, user) => request({ +export const productionComplete = (code, user) => request({ url:'api/pda/manualSorting/productionComplete', data: { workorder_code: code, @@ -89,84 +48,34 @@ export const manualSortingProductionComplete = (code, user) => request({ }) /** - * 剩料入库 + * 涂板线 */ -// 刷新 -export const callingResidueMaterialTaskShow = () => request({ - url:'api/pda/manualSorting/callingResidueMaterialTaskShow', +// 数据 +export const coatedWireIntoStorageTaskShow = () => request({ + url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow', data: {} }) -// 确认 -export const callingResidueMaterialTask = (code, qty) => request({ - url:'api/pda/manualSorting/callingResidueMaterialTask', +// 入库 +export const coatedWireIntoStorageTask = (code, qty) => request({ + url:'api/pda/manualSorting/coatedWireIntoStorageTask', data: { - vehicle_code: code, + point_code: code, qty: qty } }) /** - * 托盘绑定 + * 物料库存 */ -// 确认 -export const manualSortingBindingVehicle = (ocode, tcode) => request({ - url:'api/pda/manualSorting/bindingVehicle', - data: { - origin_vehicle_code: ocode, - target_vehicle_code: tcode - } -}) - -/** - * 包装入库 - */ -// 刷新 -export const manualSortingPackingTaskShow = () => request({ - url:'api/pda/manualSorting/packingTaskShow', +// 物料下拉框 +export const materialList = () => request({ + url:'api/pda/materialList', data: {} }) -// 确认 -export const manualSortingPackingTask = (code, qty, sqty) => request({ - url:'/api/pda/manualSorting/packingTask', - data: { - vehicle_code: code, - qty: qty, - surplus_quantity: sqty - } -}) - -/** - * 货架盘点 - */ -// 物料查询 -export const shelfMaterialQuery = (code) => request({ - url:'api/pda/shelf/materialQuery', +// 根据物料获取库存数据 +export const getInventoryMaterialInfo = (code) => request({ + url:'api/pda/getInventoryMaterialInfo', data: { material_code: code } -}) -// 确认 -export const shelfUpdateData = (code, status, vcode, qty, id) => request({ - url:'api/pda/shelf/updateData', - data: { - point_code: code, - point_status: status, - vehicle_code: vcode, - material_qty: qty, - material_id: id - } -}) - -/** - * 混碾操作 - */ -// 获取要料信息 -export const mixRequestInfo = () => request({ - url:'api/pda/mix/requestInfo', - data: {} -}) -// 删除数据 -export const mixDeleteInfo = (obj) => request({ - url:'api/pda/mix/deleteInfo', - data: obj -}) +}) \ No newline at end of file