From 7858a76e66fe04e8bc37246905dc7ac9d405ab94 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 13 Mar 2024 15:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.styl | 1 + utils/getData2.js | 345 +++++++-------------------------------- utils/mork2.js | 162 ++++++++++++++++++ 3 files changed, 220 insertions(+), 288 deletions(-) create mode 100644 utils/mork2.js diff --git a/common/style/layout.styl b/common/style/layout.styl index 14f1f07..de49991 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -49,6 +49,7 @@ uni-button:after { color: #323232; font-weight: bold; letter-spacing: 4rpx; + padding-left: 10rpx; /* text-align:justify; text-align-last: justify; text-justify: inter-ideograph; */ diff --git a/utils/getData2.js b/utils/getData2.js index 7ebf300..9a9729e 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -24,27 +24,11 @@ export const handLogin = (user, password) => request({ * 空托盘出库 */ // 1.1获取载具类型 -// export const getVehicleType = () => request({ -// url:'api/pda/group/getVehicleType', -// data: {} -// }) -export const getVehicleType = () => { - let res = [ - { - "value": "LZ", - "text": "料盅" - }, - { - "value": "GTP", - "text": "钢托盘" - }, - { - "value": "1", - "text": "木托盘" - } -] - return res -} +export const getVehicleType = () => request({ + url:'api/pda/group/getVehicleType', + data: {} +}) + // 1.2空托盘出库确认 export const callEmptyVehicle = (type, code) => request({ url:'api/pda/callEmptyVehicle', @@ -69,45 +53,17 @@ export const emptyInStore = (type, vcode, code) => request({ * 组盘入库 */ // 1.1获取物料信息 -// export const queryMaterial = () => request({ -// url:'api/pda/queryMaterial', -// data: {} -// }) -export const queryMaterial = () => { - let res = [ - { - "material_id": "19", - "material_code": "2", - "material_name": "a1" - }, - { - "material_id": "9", - "material_code": "4", - "material_name": "b1" - } -] - return res -} +export const queryMaterial = () => request({ + url:'api/pda/queryMaterial', + data: {} +}) + // 查询已配盘的组盘信息 -// export const queryExistGroup = () => request({ -// url:'api/pda/queryExistGroup', -// data: {} -// }) -export const queryExistGroup = () => { - let res = [ - { - "vehicle_code": "6", - "vehicle_type": "in ea", - "material_id": "83", - "material_code": "75", - "material_name": "式历委至统", - "point_code": "76", - "material_qty": "Ut ea veniam officia in", - "pcsn": "consequat enim proident labore" - } -] - return res -} +export const queryExistGroup = () => request({ + url:'api/pda/queryExistGroup', + data: {} +}) + // 组盘 export const groupManual = (vtype, vcode, pcode, mid, mcode, qty, isl) => request({ url:'api/pda/group/manual', @@ -122,24 +78,11 @@ export const groupManual = (vtype, vcode, pcode, mid, mcode, qty, isl) => reques } }) //获取待配盘信息 -// export const queryVehicleGroup = () => request({ -// url:'api/pda/queryVehicleGroup', -// data: {} -// }) -export const queryVehicleGroup = () => { - let res = [ - { - "group_id": "30", - "vehicle_type": "in quis magna veniam", - "vehicle_code": "91", - "material_id": "4", - "material_code": "20", - "material_name": "张认义关金", - "point_code": "16" - } -] -return res -} +export const queryVehicleGroup = () => request({ + url:'api/pda/queryVehicleGroup', + data: {} +}) + // 开始配盘 export const groupLink = (arr) => request({ url:'api/pda/group/link', @@ -152,17 +95,7 @@ export const pdaPrintf = (code) => request({ vehicle_code: code } }) -// export const pdaPrintf = (code) => { -// let res = { -// "vehicle_code": "91", -// "material_code": "20", -// "material_name": "张认义关金", -// "material_qty": "100", -// "pcsn": "20201112", -// "print_time": "20240210" -// } -// return res -// } + //入库 export const fullVehicleIn = (code) => request({ url:'api/pda/fullVehicleIn', @@ -174,27 +107,13 @@ export const fullVehicleIn = (code) => request({ * 原料出库 */ // 根据物料信息查询配盘信息 -// export const queryLinkMaterial = (id) => request({ -// url:'api/pda/queryLinkMaterial', -// data: { -// material_id: id -// } -// }) -export const queryLinkMaterial = () => { - let res = [ - { - "point_code": "78", - "point_name": "片百人共", - "vehicle_code": "52", - "material_id": "89", - "material_code": "85", - "material_name": "战干者许", - "pcsn": "ullamco Ut", - "material_qty": "100" - } -] - return res -} +export const queryLinkMaterial = (id) => request({ + url:'api/pda/queryLinkMaterial', + data: { + material_id: id + } +}) + // 1.2出库确认 export const fullVehicleOut = (code1, code2) => request({ url:'api/pda/fullVehicleOut', @@ -207,21 +126,13 @@ export const fullVehicleOut = (code1, code2) => request({ * 生产下料 */ // 根据起点查询终点列表 -// export const queryEndPointsByStart = (code) => request({ -// url:'api/pda/queryEndPointsByStart', -// data: { -// point_code1: code -// } -// }) -export const queryEndPointsByStart = (code) => { - let res = [ - { - "point_code2": "81", - "point_name": "回史就问装作过" - } -] - return res -} +export const queryEndPointsByStart = (code) => request({ + url:'api/pda/queryEndPointsByStart', + data: { + point_code1: code + } +}) + // 下料 export const createP2pTask = (code, mcode) => request({ url:'api/pda/createP2pTask', @@ -255,35 +166,11 @@ export const bindVehicle = (code, type, vcode) => request({ * 定点作业 */ // 查询设备 -// export const queryDevice = () => request({ -// url:'api/pda/queryDevice', -// data: {} -// }) -export const queryDevice = () => { - let res = [ - { - "region_code": "68", - "region_name": "构华", - "deviceArr": [ - { - "point_code": "9", - "point_name": "京产" - } - ] - }, - { - "region_code": "8", - "region_name": "构华片资", - "deviceArr": [ - { - "point_code": "19", - "point_name": "京产开向准" - } - ] - } -] - return res -} +export const queryDevice = () => request({ + url:'api/pda/queryDevice', + data: {} +}) + // 定点作业-确认 export const taskConfirm = (code1, code2) => request({ url:'api/pda/taskConfirm', @@ -296,62 +183,15 @@ export const taskConfirm = (code1, code2) => request({ * 作业管理 */ // 查询未完成指令 -// export const pdaInsts = (keyword, scode, ncode) => request({ -// url:'api/pda/insts', -// data: { -// keyword: keyword, -// start_devicecode: scode, -// next_devicecode: ncode -// } -// }) -export const pdaInsts = () => { - let res = { - "code": "1", - "desc": "in", - "result": [ - { - "inst_uuid": "51", - "task_no": "ADB001", - "start_devicecode": "46", - "next_devicecode": "2", - "inst_status": "0", - "priority": "一级", - "create_time": "1976-04-07 02:36:18", - "carrier": "890000008", - "instruction_code": '0000', - "carno": '1号车', - "inst_step": '1' - }, - { - "inst_uuid": "5", - "task_no": "ADB001", - "start_devicecode": "46", - "next_devicecode": "2", - "inst_status": "0", - "priority": "一级", - "create_time": "1976-04-07 02:36:18", - "carrier": "890000008", - "instruction_code": '0000', - "carno": '1号车', - "inst_step": '1' - }, - { - "inst_uuid": "1", - "task_no": "ADB001", - "start_devicecode": "46", - "next_devicecode": "2", - "inst_status": "2", - "priority": "一级", - "create_time": "1976-04-07 02:36:18", - "carrier": "890000008", - "instruction_code": '0000', - "carno": '1号车', - "inst_step": '1' - } - ] -} - return res -} +export const pdaInsts = (keyword, scode, ncode) => request({ + url:'api/pda/insts', + data: { + keyword: keyword, + start_devicecode: scode, + next_devicecode: ncode + } +}) + // 指令操作 export const pdaInst = (type, uuid) => request({ url:'api/pda/inst', @@ -364,22 +204,13 @@ export const pdaInst = (type, uuid) => request({ * 出库确认 */ // 根据载具编码查询配盘信息 -// export const queryGroupInfoByVehicle = (code) => request({ -// url:'api/pda/queryGroupInfoByVehicle', -// data: { -// vehicle_code: code -// } -// }) -export const queryGroupInfoByVehicle = (code) => { - let res = { - "point_code": "001", - "material_code": "100001", - "material_name": "垃圾了付定金", - "pcsn": "20202020", - "material_qty": "20.0" -} - return res -} +export const queryGroupInfoByVehicle = (code) => request({ + url:'api/pda/queryGroupInfoByVehicle', + data: { + vehicle_code: code + } +}) + // 回库 export const vehicleGoBack = (code, vcode, num) => request({ url:'api/pda/vehicleGoBack', @@ -397,66 +228,4 @@ export const fullVehicleOutConfirm = (code, vcode, num) => request({ vehicle_code: vcode, residue_num: num } -}) -/** - * 任务流转 - */ -// 1.1查询起点及其对应的终点 -export const queryAllPoints = () => request({ - url:'api/pda/queryAllPoints', - data: {} -}) -// export const queryAllPoints = () => { -// let res = [ -// { -// "point_code": "28", -// "point_name": "石例约么", -// "end_points": [ -// { -// "point_code": "61", -// "point_name": "比非强" -// } -// ] -// }, -// { -// "point_code": "29", -// "point_name": "石例约么1", -// "end_points": [ -// { -// "point_code": "12", -// "point_name": "比非强" -// }, -// { -// "point_code": "13", -// "point_name": "比非强" -// } -// ] -// } -// ] -// return res -// } - - -/** - * 原材料库入库 - */ -// 1.1查询 -export const queryPoints = (type) => request({ - url:'api/pda/queryPoints', - data: { - type: type - } -}) -// export const queryPoints = () => { -// let res = [ -// { -// "point_code": "60", -// "point_name": "同更情决" -// }, -// { -// "point_code": "61", -// "point_name": "倒垃圾了" -// } -// ] -// return res -// } +}) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js new file mode 100644 index 0000000..c624b4a --- /dev/null +++ b/utils/mork2.js @@ -0,0 +1,162 @@ +export const getVehicleType = () => { + let res = [ + { + "value": "LZ", + "text": "料盅" + }, + { + "value": "GTP", + "text": "钢托盘" + }, + { + "value": "1", + "text": "木托盘" + } +] + return res +} + +export const queryMaterial = () => { + let res = [ + { + "material_id": "19", + "material_code": "2", + "material_name": "a1" + }, + { + "material_id": "9", + "material_code": "4", + "material_name": "b1" + } +] + return res +} + +export const queryExistGroup = () => { + let res = [ + { + "vehicle_code": "6", + "vehicle_type": "in ea", + "material_id": "83", + "material_code": "75", + "material_name": "式历委至统", + "point_code": "76", + "material_qty": "Ut ea veniam officia in", + "pcsn": "consequat enim proident labore" + } +] + return res +} + +export const queryVehicleGroup = () => { + let res = [ + { + "group_id": "30", + "vehicle_type": "in quis magna veniam", + "vehicle_code": "91", + "material_id": "4", + "material_code": "20", + "material_name": "张认义关金", + "point_code": "16" + } +] +return res +} + +export const pdaPrintf = (code) => { + let res = { + "vehicle_code": "91", + "material_code": "20", + "material_name": "张认义关金", + "material_qty": "100", + "pcsn": "20201112", + "print_time": "20240210" + } + return res +} + +export const queryLinkMaterial = () => { + let res = [ + { + "point_code": "78", + "point_name": "片百人共", + "vehicle_code": "52", + "material_id": "89", + "material_code": "85", + "material_name": "战干者许", + "pcsn": "ullamco Ut", + "material_qty": "100" + } +] + return res +} + +export const queryEndPointsByStart = (code) => { + let res = [ + { + "point_code2": "81", + "point_name": "回史就问装作过" + } +] + return res +} + +export const queryDevice = () => { + let res = [ + { + "region_code": "68", + "region_name": "构华", + "deviceArr": [ + { + "point_code": "9", + "point_name": "京产" + } + ] + }, + { + "region_code": "8", + "region_name": "构华片资", + "deviceArr": [ + { + "point_code": "19", + "point_name": "京产开向准" + } + ] + } +] + return res +} + +export const pdaInsts = () => { + let res = { + "code": "1", + "desc": "in", + "result": [ + { + "inst_uuid": "51", + "task_no": "ADB001", + "start_devicecode": "46", + "next_devicecode": "2", + "inst_status": "0", + "priority": "一级", + "create_time": "1976-04-07 02:36:18", + "carrier": "890000008", + "instruction_code": '0000', + "carno": '1号车', + "inst_step": '1' + } + ] +} + return res +} + +export const queryGroupInfoByVehicle = (code) => { + let res = { + "point_code": "001", + "material_code": "100001", + "material_name": "垃圾了付定金", + "pcsn": "20202020", + "material_qty": "20.0" +} + return res +} \ No newline at end of file