子卷出入站

utils/api.js

@@ -14,92 +14,3 @@ export const handRequest = () => request({
 	data: {}
 })
 
-// 任务下发
-// 1.1查询所有区域信息
-export const handArea = (type) => request({
-	url: 'api/aja/hand/area',
-	data: {
-		area_flag: type
-	}
-})
-// 1.2根据区域查询设备编号及状态
-export const handPoint = (reg) => request({
-	url: 'api/aja/hand/point',
-	data: {
-		region: reg
-	}
-})
-// 喷漆任务
-export const handTask = (scode, ncode, type, batch) => request({
-	url: 'api/aja/hand/task',
-	data: {
-	  start_devicecode: scode,
-	  next_devicecode: ncode,
-	  material_type: type,
-	  batch: batch
-	}
-})
-
-/** 站点管理 */
-// 1查询物料下拉框
-export const handMatrial = () => request({
-	url: 'api/aja/hand/matrial'
-})
-// 1.2修改设备状态
-export const handDeviceStatus = (code, mtype, type, no, batch) => request({
-	url: 'api/aja/hand/deviceStatus',
-	data: {
-		device_code: code,
-		material_type: mtype,
-		type: type,
-		status: no,
-		batch: batch
-	}
-})
-
-/** 点位取放货确认 */
-export const handpointPut = (code, type) => request({
-	url: 'api/aja/hand/pointPut',
-	data: {
-		device_code: code,
-		status_type: type
-	}
-})
-
-/** 任务管理 */
-// 1.1 查询未完成指令
-export const queryTask = (keyword, scode, ncode) => request({
-	url: 'api/aja/hand/tasks',
-	data: {
-	  keyword: keyword,
-	  start_devicecode: scode,
-	  next_devicecode: ncode
-	}
-})
-// 1.2 指令操作
-export const taskOperation = (uuid, type) => request({
-	url: 'api/aja/hand/taskoperation',
-	data: {
-	  inst_uuid: uuid,
-	  type: type
-	}
-})
-
-/** 指令管理 */
-// 1.1 查询未完成指令
-export const queryInstraction = (keyword, scode, ncode) => request({
-	url: 'api/aja/hand/insts',
-	data: {
-	  keyword: keyword,
-	  start_devicecode: scode,
-	  next_devicecode: ncode
-	}
-})
-// 1.2 指令操作
-export const instOperation = (uuid, type) => request({
-	url: 'api/aja/hand/inst',
-	data: {
-	  inst_uuid: uuid,
-	  type: type
-	}
-})

utils/getData2.js

@@ -1,13 +1,34 @@
 import request from './request.js'
 
+// 登录
+export const handLogin = (user, password) => request({
+	url:'mobile/auth/login',
+	data: {
+		username: user,
+		password: password
+	}
+})
+
+// 测试状态码报错接口
+export const handRequest = () => request({
+	url:'getInfo/4',
+	data: {}
+})
+
 /**
  * 空管入库
  */
 // 1.1生产区域下拉框查询
-export const queryProductArea = () => request({
-	url:'api/pda/raw/queryProductArea',
-	data: {}
-})
+// export const queryProductArea = () => request({
+// 	url:'api/pda/raw/queryProductArea',
+// 	data: {}
+// })
+export const queryProductArea = () => {
+	let res = {
+		data: [{value: '1', text: 'a'}]
+	}
+	return res
+}
 // 1.2空纸管库设备物料初始化查询
 export const queryMaterialInfo1 = (code, mcode, area, option) => request({
 	url:'api/pda/empty/queryMaterialInfo',
@@ -78,6 +99,13 @@ export const shippingConfirm = (rows, code) => request({
 		point_code: code
 	}
 })
+// 1.4载具送回
+export const returnVehicle = (rows, code) => request({
+	url:'api/pda/shipping/returnVehicle',
+	data: {
+		point_code: code
+	}
+})
 
 /**
  * 子卷进站
@@ -113,7 +141,6 @@ export const devicePointQuery = (code) => request({
 export const queryMaterialInfo4 = (code, area) => request({
 	url:'api/pda/out/queryMaterialInfo',
 	data: {
-		device_code: code,
 		product_area: area
 	}
 })
@@ -126,6 +153,20 @@ export const outConfirm = (code, rows, is) => request({
 		is_last: is
 	}
 })
+// 1.3缓存点位查询
+export const conveyPointQuery = (area) => request({
+	url:'api/pda/in/conveyPointQuery',
+	data: {
+		product_area: area
+	}
+})
+// 1.4出站配送
+export const conveyConfirm = (code) => request({
+	url:'api/pda/in/conveyConfirm',
+	data: {
+		point_code: code
+	}
+})
 
 /**
  * 半成品入库

utils/request.js

@@ -65,9 +65,9 @@ const request = (params) => {
 						showCancel: false
 					})
 					store.dispatch('delUserInfo')
-					uni.redirectTo({
-						url: '/pages/login/login'
-					})
+					// uni.redirectTo({
+					// 	url: '/pages/login/login'
+					// })
 				} else if (res[1] && res[1].statusCode === 200) {
 					let {
 						data: dataType