+
@@ -264,14 +301,25 @@ export default {
vechineList: [],
currentRow1: null,
currentRow2: null,
- currentRow3: null,
pkObj: {},
checked: false,
pointState: {},
emptyObj: {},
- sendObj: {}
+ sendObj: {},
+ backObj: {},
+ val1: '',
+ options1: [],
+ val2: '',
+ options2: [],
+ check1: false,
+ check2: false
}
},
+ created() {
+ crudProduceScreen.vehicleType().then(res => {
+ this.options1 = [...res.content]
+ })
+ },
methods: {
showPop(type, name) {
this.type = type
@@ -280,6 +328,7 @@ export default {
crudProduceScreen.regionList().then(res => {
this.machineData = [...res]
this.show = true
+ this.options2 = [...res]
})
} else if (type === 2 && name in this.pointState) {
crudProduceScreen.regionOrder(this.pointState[name]).then(res => {
@@ -288,18 +337,27 @@ export default {
this.show = true
})
} else if (type === 3 && name in this.pointState) {
+ this.emptyObj = {}
+ this.val1 = ''
+ this.val2 = ''
this.show = true
this.emptyObj.device_code = this.pointState[name]
- this.emptyObj.vehicle_type = ''
- this.emptyObj.regin_code = ''
} else if (type === 4 && name in this.pointState) {
+ this.sendObj = {}
+ this.val2 = ''
+ this.check1 = false
+ this.check2 = false
this.show = true
+ this.sendObj.order_code = ''
+ this.sendObj.material_qty = null
+ this.sendObj.vehicle_code = ''
this.sendObj.device_code = this.pointState[name]
- this.emptyObj.vehicle_code = ''
- this.emptyObj.order_code = ''
- this.emptyObj.material_qty = ''
- this.emptyObj.region_code = ''
- this.emptyObj.has_report = false
+ } else if (type === 5 && name in this.pointState) {
+ this.backObj = {}
+ this.val2 = ''
+ this.show = true
+ this.backObj.material_qty = null
+ this.backObj.device_code = this.pointState[name]
}
},
handleCurrentChange1(val) {
@@ -307,15 +365,6 @@ export default {
},
handleCurrentChange2(val) {
this.currentRow2 = val
- crudProduceScreen.getMaterListByOrder(this.pointState[this.buttonName], val.order_code).then(res => {
- res.content.map(el => {
- this.$set(el, 'point_status_name', ['无货', '空托盘', '有料'][Number(el.point_status)])
- })
- this.vechineList = [...res.content]
- })
- },
- handleCurrentChange3(val) {
- this.currentRow3 = val
},
toSure1() {
if (this.currentRow1 === null) {
@@ -328,33 +377,71 @@ export default {
this.pointState = res
})
},
- toSure() {
- if (this.currentRow1 === null) {
+ toCall() {
+ if (this.currentRow2 === null) {
this.$message.error('请选择设备！')
return
}
- this.pkObj = this.currentRow1
- this.show = false
- },
- toCall() {
- crudProduceScreen.callMater(this.currentRow3).then(res => {
+ crudProduceScreen.callMater(this.currentRow2).then(res => {
this.$message(res.msg)
})
this.show = false
},
toSure3() {
+ if (!this.val1) {
+ this.$message.error('请选择托盘类型！')
+ return
+ }
+ if (!this.val2) {
+ this.$message.error('请选择设备工序！')
+ return
+ }
+ this.emptyObj.vehicle_type = this.val1
+ this.emptyObj.regin_code = this.val2
crudProduceScreen.callEmp(this.emptyObj).then(res => {
this.$message(res.msg)
})
this.show = false
- this.emptyObj = {}
},
toSure4() {
+ if (this.sendObj.order_code === '') {
+ this.$message.error('请输入订单编码！')
+ return
+ }
+ if (this.sendObj.material_qty === '' || this.sendObj.material_qty === null) {
+ this.$message.error('请输入合格数量！')
+ return
+ }
+ if (!this.val2) {
+ this.$message.error('请选择设备工序！')
+ return
+ }
+ if (this.sendObj.vehicle_code === '') {
+ this.$message.error('请输入载具编码！')
+ return
+ }
+ this.sendObj.regin_code = this.val2
+ this.sendObj.has_report = this.check1
+ this.sendObj.target_region_code = this.check2
crudProduceScreen.sendMater(this.sendObj).then(res => {
this.$message(res.msg)
})
this.show = false
- this.sendObj = {}
+ },
+ toSure5() {
+ if (this.backObj.material_qty === '' || this.backObj.material_qty === null) {
+ this.$message.error('请输入物料数量！')
+ return
+ }
+ if (!this.val2) {
+ this.$message.error('请选择设备工序！')
+ return
+ }
+ this.backObj.regin_code = this.val2
+ crudProduceScreen.sendVehicle(this.backObj).then(res => {
+ this.$message(res.msg)
+ })
+ this.show = false
}
}
}
@@ -516,7 +603,7 @@ export default {
.pop-wraper-1 {
width: 50%;
left: 25%;
- height: 70%;
+ height: 60%;
padding: 5% 3% 3% 3%;
background: center / 100% 100% url('~@/assets/images/screen_4.png') no-repeat;
}
@@ -613,10 +700,35 @@ export default {
text-align: left;
color: #fff;
margin: 0;
- padding: 0 20px;
+ padding: 0 30px 0 15px;
background: rgba(45,88,184,0.25);
border: 1px solid #21D0F2;
}
+.select-wraper {
+ font-size: 18px;
+ line-height: 40px;
+ height: 40px;
+ text-align: left;
+ color: #fff;
+ >>>.el-select {
+ width: 100%;
+ }
+ >>>.el-input__inner {
+ background-color: rgba(45,88,184,0.25);
+ border-color: #21D0F2;
+ }
+ >>>.el-input--mini .el-input__inner {
+ font-size: 18px;
+ line-height: 40px;
+ height: 40px;
+ color: #fff;
+ }
+}
+.option-wraper {
+ font-size: 18px;
+ line-height: 40px;
+ height: 40px;
+}
>>>.el-checkbox__inner {
width: 40px;
height: 40px;
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
index 9ec8fd7..b4cc2e8 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
@@ -78,6 +78,23 @@ export function getMaterListByOrder(code, order) {
// })
// }
+// 载具类型列表
+export function vehicleType(data) {
+ return request({
+ url: 'api/fab/vehicleType',
+ method: 'post',
+ data
+ })
+}
+// export function vehicleType() {
+// let res = {
+// content: [{ label: 'aa', value: '11'}, { label: 'bb', value: '22'}]
+// }
+// return new Promise((resolve, reject) => {
+// resolve(res)
+// })
+// }
+
// 呼叫库存物料
export function callMater(data) {
return request({
@@ -105,6 +122,15 @@ export function sendMater(data) {
})
}
+// 叫料点回库
+export function sendVehicle(data) {
+ return request({
+ url: 'api/fab/sendVehicle',
+ method: 'post',
+ data
+ })
+}
+
export default {
- regionList, regionPoints, regionOrder, getMaterListByOrder, callMater, callEmp, sendMater
+ regionList, regionPoints, regionOrder, getMaterListByOrder, vehicleType, callMater, callEmp, sendMater, sendVehicle
}