指令、作业、点位管理

utils/getData2.js

@@ -21,213 +21,66 @@ export const handLogin = (user, password) => request({
 	}
 })
 /**
- * 空托盘出库
+ * 站点管理
  */
-// 1.1获取载具类型
-export const getVehicleType = () => request({
-	url:'api/pda/group/getVehicleType',
+// 1.1查询所有区域信息
+export const queryArea = () => request({
+	url:'api/hand/queryArea',
 	data: {}
 })
-
-// 1.2空托盘出库确认
-export const callEmptyVehicle = (type, code) => request({
-	url:'api/pda/callEmptyVehicle',
+// 1.2根据区域查询设备编号及状态
+export const queryPointByArea = (code) => request({
+	url:'api/hand/queryPointByArea',
 	data: {
-		vehicle_type: type,
-		point_code: code
+		areaCode: code
+	}
+})
+// 1.3创建任务(生成任务号为-开头)
+export const callTask = (scode, ncode, type) => request({
+	url:'api/hand/callTask',
+	data: {
+		start_device_code: scode,
+		next_device_code: ncode,
+		task_type: type
 	}
 })
 /**
- * 空托盘入库
+ * 指令管理
  */
-// 1.1空托盘入库确认
-export const emptyInStore = (type, vcode, code) => request({
-	url:'api/pda/emptyInStore',
+// 1.1 查询未完成指令(生成任务号为-开头)
+export const handInsts = (key, scode, ncode) => request({
+	url:'api/hand/insts',
 	data: {
-		vehicle_type: type,
-		vehicle_code: vcode,
-		point_code: code
-	}
-})
-/**
- * 组盘入库
- */
-// 1.1获取物料信息
-export const queryMaterial = () => request({
-	url:'api/pda/queryMaterial',
-	data: {}
-})
-
-// 查询已配盘的组盘信息
-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',
-	data: {
-		vehicle_type: vtype,
-		vehicle_code: vcode,
-		point_code: pcode,
-		material_id: mid,
-		material_code: mcode,
-		material_qty: qty,
-		is_link: isl
-	}
-})
-//获取待配盘信息
-export const queryVehicleGroup = () => request({
-	url:'api/pda/queryVehicleGroup',
-	data: {}
-})
-
-// 开始配盘
-export const groupLink = (arr) => request({
-	url:'api/pda/group/link',
-	data: arr
-})
-// 打印
-export const pdaPrintf = (code) => request({
-	url:'api/pda/printf',
-	data: {
-		vehicle_code: code
-	}
-})
-
-//入库
-export const fullVehicleIn = (code) => request({
-	url:'api/pda/fullVehicleIn',
-	data: {
-		point_code: code
-	}
-})
-/**
- * 原料出库
- */
-// 根据物料信息查询配盘信息
-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',
-	data: {
-		point_code1: code1,
-		point_code2: code2
-	}
-})
-/**
- * 生产下料
- */
-// 根据起点查询终点列表
-export const queryEndPointsByStart = (code) => request({
-	url:'api/pda/queryEndPointsByStart',
-	data: {
-		point_code1: code
-	}
-})
-
-// 下料
-export const createP2pTask = (code, mcode) => request({
-	url:'api/pda/createP2pTask',
-	data: {
-		point_code1: code,
-		point_code2: mcode
-	}
-})
-/**
- * 点位更新
- */
-// 解绑
-export const unbindVehicle = (code, type, vcode) => request({
-	url:'api/pda/unbindVehicle',
-	data: {
-		point_code: code,
-		vehicle_type: type,
-		vehicle_code: vcode
-	}
-})
-// 绑定
-export const bindVehicle = (code, type, vcode) => request({
-	url:'api/pda/bindVehicle',
-	data: {
-		point_code: code,
-		vehicle_type: type,
-		vehicle_code: vcode
-	}
-})
-/**
- * 定点作业
- */
-// 查询设备
-export const queryDevice = () => request({
-	url:'api/pda/queryDevice',
-	data: {}
-})
-
-// 定点作业-确认
-export const taskConfirm = (code1, code2) => request({
-	url:'api/pda/taskConfirm',
-	data: {
-		point_code1: code1,
-		point_code2: code2
-	}
-})
-/**
- * 作业管理
- */
-// 查询未完成指令
-export const pdaInsts = (keyword, scode, ncode) => request({
-	url:'api/pda/insts',
-	acsurl: true,
-	data: {
-		keyword: keyword,
+		keyword: key,
 		start_devicecode: scode,
 		next_devicecode: ncode
 	}
 })
-
-// 指令操作
-export const pdaInst = (type, uuid) => request({
-	url:'api/pda/inst',
-	acsurl: true,
+// 1.2 指令操作
+export const handInst = (type, id) => request({
+	url:'api/hand/inst',
 	data: {
 		type: type,
-		inst_uuid: uuid
+		inst_uuid: id
 	}
 })
 /**
- * 出库确认
+ * 任务管理
  */
-// 根据载具编码查询配盘信息
-export const queryGroupInfoByVehicle = (code) => request({
-	url:'api/pda/queryGroupInfoByVehicle',
+// 1.1 1.1 查询无指令的任务（任务号为-开头）
+export const handTasks = (key, scode, ncode) => request({
+	url:'api/hand/tasks',
 	data: {
-		vehicle_code: code
+		keyword: key,
+		start_devicecode: scode,
+		next_devicecode: ncode
 	}
 })
-
-// 回库
-export const vehicleGoBack = (code, vcode, num) => request({
-	url:'api/pda/vehicleGoBack',
+// 1.2 任务操作
+export const handTaskoperation = (type, id) => request({
+	url:'api/hand/taskoperation',
 	data: {
-		point_code: code,
-		vehicle_code: vcode,
-		residue_num: num
-	}
-})
-// 出库确认
-export const fullVehicleOutConfirm = (code, vcode, num) => request({
-	url:'api/pda/fullVehicleOutConfirm',
-	data: {
-		point_code: code,
-		vehicle_code: vcode,
-		residue_num: num
+		type: type,
+		task_uuid: id
 	}
 })

utils/mork2.js

@@ -1,159 +1,13 @@
-export const handLogin = (user, password) => {
+export const handInsts = () => {
 	let res = {
-		user: {
-			user: {username: 'admin'},
-		},
-		token: 'abcd'
-	}
-	return res
-}
-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 groupLink = (arr) => {
-	let res = {
-    "message": "tempor elit adipisicing cillum nisi"
-	}
-	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": [
+    "message": "ok",
+    "data": [
         {
             "inst_uuid": "51",
             "task_no": "ADB001",
             "start_devicecode": "46",
             "next_devicecode": "2",
-            "inst_status": "0",
+            "inst_status": "3",
             "priority": "一级",
             "create_time": "1976-04-07 02:36:18",
             "carrier": "890000008",
@@ -165,14 +19,72 @@ export const pdaInsts = () => {
 }
 	return res
 }
-
-export const queryGroupInfoByVehicle = (code) => {
+export const handInst = (code) => {
 	let res = {
-    "point_code": "001",
-    "material_code": "100001",
-    "material_name": "垃圾了付定金",
-    "pcsn": "20202020",
-    "material_qty": "20.0"
+    "message": "001"
 }
 	return res
+}
+export const queryTask = (keyword, scode, ncode) => {
+	let res = {
+    "message": "ok",
+    "data": [
+        {
+            "inst_uuid": "51",
+            "task_no": "ADB001",
+            "start_devicecode": "46",
+            "next_devicecode": "2",
+            "inst_status": "1",
+            "priority": "一级",
+            "create_time": "1976-04-07 02:36:18",
+            "carrier": "890000008",
+			"instruction_code": '0000',
+			"carno": '1号车',
+			"inst_step": '1'
+        }
+    ]
+}
+	return res
+}
+// 1.2 指令操作
+export const taskOperation = (uuid, type) => {
+	let res = {
+    "message": "001"
+}
+	return res
+}
+export const queryArea = () => {
+  let res = {
+    result: [{region_code: '1', region_name: 'A1'}, {region_code: '2', region_name: 'A2'}, {region_code: '3', region_name: 'A2'}, {region_code: '4', region_name: 'A10'}]
+  }
+  return res
+}
+export const queryPointByArea = () => {
+  let res = {
+    result: [{
+		device_code: '1',
+		device_name: 'JLDFJLLJ',
+		source_device: 'FAL3LAA01',
+		status: '1'
+	}, {
+		device_code: '12',
+		device_name: 'JLDFJLLJ'
+	}, {
+		device_code: '13',
+		device_name: 'JLDFJLLJ'
+	}, {
+		device_code: '14',
+		device_name: 'JLDFJLLJ'
+	}, {
+		device_code: '15',
+		device_name: 'JLDFJLLJ'
+	}, {
+		device_code: '16',
+		device_name: 'JLDFJLLJ'
+	}, {
+		device_code: '17',
+		device_name: 'JLDFJLLJ'
+	}]
+  }
+  return res
 }