diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue index 88c5fd3..f6aba4f 100644 --- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue +++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue @@ -204,7 +204,7 @@ export default { methods: { toExit() { this.disabled = true - crudProduceScreen.loginOut({ username: this.screenData.username }).then(res => { + crudProduceScreen.loginOut({ username: this.screenData.username, device_code: this.screenData.device_code }).then(res => { this.disabled = false localStorage.removeItem('screenData') this.$router.push('/produceScreen/setup') @@ -253,7 +253,7 @@ export default { this.disabled = false return } - crudProduceScreen.callMater(this.popSecList).then(res => { + crudProduceScreen.callMater({ mater: this.popSecList, device_code: this.popData.device_code }).then(res => { this.disabled = false this.$message(res.msg) }).catch(() => { @@ -265,7 +265,7 @@ export default { this.$message.error('请选择托盘类型!') return } - crudProduceScreen.callEmp({ vehicle_type: this.value }).then(res => { + crudProduceScreen.callEmp({ vehicle_type: this.value, device_code: this.popData.device_code }).then(res => { this.disabled = false this.$message(res.msg) }).catch(() => { @@ -279,7 +279,7 @@ export default { this.disabled = false }) } else if (this.type === 'BACK') { - crudProduceScreen.sendVehicle(this.popList).then(res => { + crudProduceScreen.sendVehicle({ mater: this.popList, device_code: this.popData.device_code }).then(res => { this.$message(res.msg) }).catch(() => { this.disabled = false diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js new file mode 100644 index 0000000..b45f906 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js @@ -0,0 +1,112 @@ +import request from '@/utils/request' + +// 1.用户登录 +export function authLogin() { + const res = { username: 'aaa' } + return new Promise((resolve, reject) => { + resolve(res) + }) +} + +// 2.选择登录设备 +export function getUserOrDevice() { + const res = { + content: [ + { point_code: '111-02', point_name: 'TP5000冲床加工' }, + { point_code: '111 03', point_name: '警平' } + ] + } + return new Promise((resolve, reject) => { + resolve(res) + }) +} + +// 3.登录跳转 +export function deviceInLogin() { + const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: '1234' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: 'N1', type: '0', device_code: '1234' }, { name: 'N2', type: '0', device_code: '1234' }] } + return new Promise((resolve, reject) => { + resolve(res) + }) +} + +// 4.根据工序查询订单 +export function regionOrder(code) { + const res = { + content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }] + } + return new Promise((resolve, reject) => { + resolve(res) + }) +} + +// 5.查询载具物料信息 +export function fabMaterial() { + const res = { + content: [ + { order_code: '111-02', material_qty: '' } + ] + } + return new Promise((resolve, reject) => { + resolve(res) + }) +} + +// 6.呼叫库存物料 +export function callMater(data) { + return request({ + url: 'api/fab/callMater', + method: 'post', + data + }) +} + +// 7.呼叫空料框 +export function callEmp(data) { + return request({ + url: 'api/fab/callEmp', + method: 'post', + data + }) +} + +// 8.查询订单号 +export function fabOrders() { + const res = { + content: [ + { order_code: '111-02', material_qty: '' } + ] + } + return new Promise((resolve, reject) => { + resolve(res) + }) +} + +// 9.工序下料 +export function sendMater(data) { + return request({ + url: 'api/fab/sendMater', + method: 'post', + data + }) +} + +// 10.叫料点回库 +export function sendVehicle(data) { + return request({ + url: 'api/fab/sendVehicle', + method: 'post', + data + }) +} + +// 11.用户登出 +export function loginOut() { + const res = {} + return new Promise((resolve, reject) => { + resolve(res) + }) +} + +export default { + authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, loginOut +} diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/style.scss b/lms/nladmin-ui/src/views/wms/produceScreen/style.scss index eb09e85..a087b3a 100644 --- a/lms/nladmin-ui/src/views/wms/produceScreen/style.scss +++ b/lms/nladmin-ui/src/views/wms/produceScreen/style.scss @@ -181,9 +181,8 @@ } .button-wraper { display: flex; - justify-content: flex-start; + justify-content: center; width: 84%; - height: 40%; } .button-item { width: 15%; @@ -191,7 +190,7 @@ border-radius: 20px; background-image: linear-gradient(to right, rgba(36, 128, 207, 0.5), rgba(15, 61, 101, 0.5)); margin-right: 2%; - padding: 2% 0; + padding-top: 30px; &:last-child { margin-right: 0; }