root/pad-hlzgbz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分拣管理接口

Browse Source
This commit is contained in:
caill
2022-09-20 14:53:45 +08:00
parent a466275370
commit 80b4078643
2 changed files with 159 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

284
src/config/getData2.js
View File

@@ -6,148 +6,148 @@ import {post} from '@config/http.js'
*/ */
// 1.查询分拣工单及明细（定时查询） // 1.查询分拣工单及明细（定时查询）
// export const sortingOrder = (reg) => post('api/hand/sortingOrder', {}) export const sortingOrder = (reg) => post('api/hand/sortingOrder', {})
export const sortingOrder = () => { // export const sortingOrder = () => {
let res = { // let res = {
result: [ // result: [
{ // {
alloy: '', // alloy: '',
is_labeling: '1', // is_labeling: '1',
type: 'order', // type: 'order',
order_status: '06', // order_status: '06',
material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1', // material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1',
material_spec: '22.23', // material_spec: '22.23',
children: [ // children: [
{ // {
labeling_template: '15', // labeling_template: '15',
color_type: '6', // color_type: '6',
lettering_message: '77', // lettering_message: '77',
type: 'orderDetail', // type: 'orderDetail',
order_code: '1', // order_code: '1',
order_status: '00', // order_status: '00',
cust_code: 'A00001', // cust_code: 'A00001',
lettering_icon: '1', // lettering_icon: '1',
strap_number: '99', // strap_number: '99',
parent_order_code: '10000037', // parent_order_code: '10000037',
qty: '11', // qty: '11',
is_flag: '0', // is_flag: '0',
lettering_message2: '88', // lettering_message2: '88',
cust_name: 'A00001', // cust_name: 'A00001',
parent_order_id: '907694f7e2de49bc943a8575ab5b3395', // parent_order_id: '907694f7e2de49bc943a8575ab5b3395',
order_id: '57fbc012c50d4398b91142086d5445b6', // order_id: '57fbc012c50d4398b91142086d5445b6',
cust_id: '092f1d84fddb417a914c8aa20d5bca81' // cust_id: '092f1d84fddb417a914c8aa20d5bca81'
} // }
], // ],
material_name: '直管14', // material_name: '直管14',
wall_thickness: '0.20', // wall_thickness: '0.20',
is_coating: '1', // is_coating: '1',
jackup_num: '5', // jackup_num: '5',
length: '4000.00', // length: '4000.00',
end_time: '', // end_time: '',
outer_diameter: '22.23', // outer_diameter: '22.23',
order_code: '10000037', // order_code: '10000037',
start_time: '', // start_time: '',
temper: '', // temper: '',
feeding_mouth: '3', // feeding_mouth: '3',
is_strapping: '1', // is_strapping: '1',
qty: '11', // qty: '11',
is_flag: '1', // is_flag: '1',
is_risking: '1', // is_risking: '1',
order_id: '907694f7e2de49bc943a8575ab5b3395', // order_id: '907694f7e2de49bc943a8575ab5b3395',
is_lettering: '1', // is_lettering: '1',
material_code: 'A10014' // material_code: 'A10014'
}, // },
{ // {
alloy: '', // alloy: '',
is_labeling: '1', // is_labeling: '1',
type: 'order', // type: 'order',
order_status: '01', // order_status: '01',
material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1', // material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1',
material_spec: '22.23', // material_spec: '22.23',
children: [ // children: [
{ // {
labeling_template: '15', // labeling_template: '15',
color_type: '7', // color_type: '7',
lettering_message: '', // lettering_message: '',
type: 'orderDetail', // type: 'orderDetail',
order_code: '2', // order_code: '2',
order_status: '05', // order_status: '05',
cust_code: 'A00001', // cust_code: 'A00001',
lettering_icon: '2', // lettering_icon: '2',
strap_number: '3', // strap_number: '3',
parent_order_code: '10000038', // parent_order_code: '10000038',
qty: '5555', // qty: '5555',
is_flag: '0', // is_flag: '0',
lettering_message2: '33', // lettering_message2: '33',
cust_name: 'A00001', // cust_name: 'A00001',
parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec', // parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
order_id: '1333a8a35df64432bb0e314d9636d2db', // order_id: '1333a8a35df64432bb0e314d9636d2db',
cust_id: '092f1d84fddb417a914c8aa20d5bca81' // cust_id: '092f1d84fddb417a914c8aa20d5bca81'
}, // },
{ // {
labeling_template: '14', // labeling_template: '14',
color_type: '7', // color_type: '7',
lettering_message: '', // lettering_message: '',
type: 'orderDetail', // type: 'orderDetail',
order_code: '1', // order_code: '1',
order_status: '04', // order_status: '04',
cust_code: 'A00002', // cust_code: 'A00002',
lettering_icon: '1', // lettering_icon: '1',
strap_number: '1', // strap_number: '1',
parent_order_code: '10000038', // parent_order_code: '10000038',
qty: '5555', // qty: '5555',
is_flag: '0', // is_flag: '0',
lettering_message2: '1', // lettering_message2: '1',
cust_name: 'A00002', // cust_name: 'A00002',
parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec', // parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
order_id: '250354651d614a6dbc445e4089ce0e72', // order_id: '250354651d614a6dbc445e4089ce0e72',
cust_id: '4b80d1c012e44027ad09b9f33ca7af0d' // cust_id: '4b80d1c012e44027ad09b9f33ca7af0d'
}, // },
{ // {
labeling_template: '15', // labeling_template: '15',
color_type: '6', // color_type: '6',
lettering_message: '55', // lettering_message: '55',
type: 'orderDetail', // type: 'orderDetail',
order_code: '3', // order_code: '3',
order_status: '05', // order_status: '05',
cust_code: 'A00002', // cust_code: 'A00002',
lettering_icon: '2', // lettering_icon: '2',
strap_number: '55', // strap_number: '55',
parent_order_code: '10000038', // parent_order_code: '10000038',
qty: '5555', // qty: '5555',
is_flag: '0', // is_flag: '0',
lettering_message2: '5', // lettering_message2: '5',
cust_name: 'A00002', // cust_name: 'A00002',
parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec', // parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
order_id: 'e7356f2f443f499e8807bac8cfb3ddce', // order_id: 'e7356f2f443f499e8807bac8cfb3ddce',
cust_id: '4b80d1c012e44027ad09b9f33ca7af0d' // cust_id: '4b80d1c012e44027ad09b9f33ca7af0d'
} // }
], // ],
material_name: '直管14', // material_name: '直管14',
wall_thickness: '0.20', // wall_thickness: '0.20',
is_coating: '1', // is_coating: '1',
jackup_num: '5', // jackup_num: '5',
length: '4000.00', // length: '4000.00',
end_time: '', // end_time: '',
outer_diameter: '22.23', // outer_diameter: '22.23',
order_code: '10000038', // order_code: '10000038',
start_time: '', // start_time: '',
temper: '', // temper: '',
feeding_mouth: '3', // feeding_mouth: '3',
is_strapping: '1', // is_strapping: '1',
qty: '5555', // qty: '5555',
is_flag: '1', // is_flag: '1',
is_risking: '1', // is_risking: '1',
order_id: 'fb8f80bee3c9455c8a902e4911acf1ec', // order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
is_lettering: '1', // is_lettering: '1',
material_code: 'A10014' // material_code: 'A10014'
} // }
], // ],
code: '1', // code: '1',
desc: '查询成功' // desc: '查询成功'
} // }
return res // return res
} // }
// 2.下发刻字、贴标 // 2.下发刻字、贴标
export const sendMessage = (type, uuid, ouuid) => post('api/hand/sendMessage', { export const sendMessage = (type, uuid, ouuid) => post('api/hand/sendMessage', {
type: type, type: type,

66
src/config/http.js
View File

@@ -1,13 +1,9 @@
import axios from 'axios' import axios from 'axios'
// import qs from 'qs' import { Dialog, toast } from './utils.js'
import { Dialog } from './utils.js'
// import { Dialog, toast } from './utils.js'
import store from '../vuex/store' import store from '../vuex/store'
// import router from './../router' import router from '@/router'
axios.defaults.timeout = 50000 axios.defaults.timeout = 50000
// axios.defaults.retry = 5
// axios.defaults.retryDelay = 10000
axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8' axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
axios.interceptors.request.use( axios.interceptors.request.use(
@@ -29,49 +25,23 @@ axios.interceptors.request.use(
axios.interceptors.response.use( axios.interceptors.response.use(
response => { response => {
return Promise.resolve(response) if (response.status === 200) {
return Promise.resolve(response)
} else {
return Promise.reject(response)
}
}, },
error => { error => {
// let condata = error.config.data.split('&') if (error && error.response) {
// console.log('condata', condata) switch (error.response.status) {
// if (condata[1] === '_SRVMETHOD=queryProduceOrderReprot' || condata[1] === '_SRVMETHOD=queryQCRecord' || condata[1] === '_SRVMETHOD=queryEquipWorkTeam') { case 401:
// toast(error.message) toast(error.response.data.message)
// setTimeout(() => { store.dispatch('setSignOut')
// router.replace({ router.push('/login')
// path: '/login' break
// }) }
// }, 10000) }
// } else {
// if (condata[1] === '_SRVMETHOD=queryEquip') {
// toast(error.message)
// } else {
// Dialog(error.message)
// }
// // Dialog(error.message)
// }
// toast(error.message)
// - 20201215-x
// router.push({
// path: '/500',
// query: {redirect: router.currentRoute.fullPath}
// })
// - 20201215-x
return Promise.reject(error) return Promise.reject(error)
// let config = error.config
// if (!config || !config.retry) return Promise.reject(error)
// config.__retryCount = config.__retryCount || 0
// if (config.__retryCount >= config.retry) {
// return Promise.reject(error)
// }
// config.__retryCount += 1
// let backoff = new Promise(resolve => {
// setTimeout(() => {
// resolve()
// }, config.retryDelay || 1)
// })
// return backoff.then(() => {
// return axios(config)
// })
} }
) )
@@ -79,11 +49,9 @@ export const post = (sevmethod, params) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios.post(`${store.getters.baseUrl}/` + sevmethod, params) axios.post(`${store.getters.baseUrl}/` + sevmethod, params)
.then(response => { .then(response => {
// if (response.data.code === '0') {
// Dialog(response.data.desc)
// }
resolve(response.data) resolve(response.data)
}, error => { }, error => {
Dialog(error.message)
reject(error.message) reject(error.message)
}) })
.catch((error) => { .catch((error) => {