diff --git a/hw-ui/src/api/board/laserLight.js b/hw-ui/src/api/board/laserLight.js
index e629c4fa..32938244 100644
--- a/hw-ui/src/api/board/laserLight.js
+++ b/hw-ui/src/api/board/laserLight.js
@@ -23,7 +23,17 @@ export function startNextProductPlanDetail(query) {
// 获取信息
export function getNewestProductPlanDetail(query) {
return request({
- url: '/mes/api/getNewestProductPlanDetail/'+query,
+ url: '/mes/api/getNewestProductPlanDetail/',
method: 'get',
+ params: query
+ })
+}
+
+// 完成
+export function completeProductPlanDetail(query) {
+ return request({
+ url: '/mes/api/completeProductPlanDetail',
+ method: 'post',
+ data: query
})
}
diff --git a/hw-ui/src/views/board/firstFloor/index.vue b/hw-ui/src/views/board/firstFloor/index.vue
index 1c2b4d05..58f5fd0b 100644
--- a/hw-ui/src/views/board/firstFloor/index.vue
+++ b/hw-ui/src/views/board/firstFloor/index.vue
@@ -81,6 +81,14 @@
+
+
计划明细
@@ -201,17 +217,11 @@
title="领料"
width="40%">
-
+
-
-
-
-
-
-
-
-
+
+
@@ -247,6 +257,7 @@
>
{
- this.tableData = e.data
- getProductPlanDetails({planId: e.data?.[0]?.planId}).then(res => {
- this.tableData1 = res.data
+ getProductPlans({pageNum: 1, pageSize: 5}).then(e => {
+ this.tableData = e.rows
+ this.totalNum1 = Math.ceil(e.total / 5)
+ this.materialBomId = e.rows?.[0]?.materialBomId
+ getProductPlanDetails({pageNum: 1, pageSize: 5, planId: e.rows?.[0]?.planId}).then(res => {
+ this.tableData1 = res.rows
+ this.totalNum2 = Math.ceil(res.total / 5)
})
})
this.$refs.chart2.setData({
@@ -497,8 +502,36 @@ export default {
})
},
methods: {
+ next1() {
+ this.nowNum1 += 1
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ this.tableData = e.rows
+ this.totalNum1 = Math.ceil(e.total / 5)
+ })
+ },
+ pre1() {
+ this.nowNum1 -= 1
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ this.tableData = e.rows
+ this.totalNum1 = Math.ceil(e.total / 5)
+ })
+ },
+ next2() {
+ this.nowNum2 += 1
+ getProductPlanDetails({pageNum: this.nowNum2, pageSize: 5, planId: this.planId}).then(res => {
+ this.tableData1 = res.rows
+ this.totalNum2 = Math.ceil(res.total / 5)
+ })
+ },
+ pre2() {
+ this.nowNum2 -= 1
+ getProductPlanDetails({pageNum: this.nowNum2, pageSize: 5, planId: this.planId}).then(res => {
+ this.tableData1 = res.rows
+ this.totalNum2 = Math.ceil(res.total / 5)
+ })
+ },
+ // 开始/继续计划
planExecute(e) {
- console.log(e)
if (e.planDetailStatus === '1') {
this.$confirm('是否开始计划', '确认', {
confirmButtonText: '确定',
@@ -510,8 +543,9 @@ export default {
})
.finally(() => {
this.getDetail({row: {planId: e.planId}})
- getProductPlans().then(e => {
- this.tableData = e.data
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ this.tableData = e.rows
+ this.totalNum1 = Math.ceil(e.total / 5)
})
})
})
@@ -533,8 +567,9 @@ export default {
})
.finally(() => {
this.getDetail({row: {planId: e.planId}})
- getProductPlans().then(e => {
- this.tableData = e.data
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ this.tableData = e.rows
+ this.totalNum1 = Math.ceil(e.total / 5)
})
})
})
@@ -546,9 +581,13 @@ export default {
})
}
},
+ // 生成/获取明细
getDetail(e) {
- getProductPlanDetails({planId: e.row.planId}).then(res => {
- if (res.data.length === 0) {
+ this.planId = e.row.planId
+ this.materialBomId = e.row.materialBomId
+ this.nowNum2 = 1
+ getProductPlanDetails({pageNum: 1, pageSize: 5, planId: e.row.planId}).then(res => {
+ if (res.rows.length === 0) {
this.$confirm('是否生成计划明细', '确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -557,7 +596,10 @@ export default {
insertProductPlanDetails({
"planId": e.row.planId,
}).then(val => {
- this.tableData1 = val.data
+ getProductPlanDetails({pageNum: this.nowNum2, pageSize: 5, planId: e.row.planId}).then(res => {
+ this.tableData1 = res.rows
+ this.totalNum2 = Math.ceil(res.total / 5)
+ })
this.$message({
type: 'info',
message: `生成完成`
@@ -571,32 +613,33 @@ export default {
});
})
} else {
- this.tableData1 = res.data
+ this.tableData1 = res.rows
+ this.totalNum2 = Math.ceil(res.total / 5)
}
})
},
+ // 领料页面
getMaterials(val) {
this.searchMaterialValue = ''
this.dialogVisible = true
this.form = {
warehouseId: '',
- planCode: val.row.planNumber,
- productId: '' || 2,
- planDetailCode: '' || 1,
+ planCode: val.row.planCode,
+ planDetailCode: val.row.planDetailCode,
applyReason: '',
taskType: '1',
wmsRawOutstockDetailList: []
}
- getWarehouses({
- warehouseFloor: 1
- }).then(e => {
+ // 获取仓库信息
+ getWarehouses().then(e => {
this.warehouseList = e.data
this.form.warehouseId = e.data[0]?.warehouseId
})
+ // 获取物料信息
getMaterialBoms({
- ancestors: 1,
+ ancestors: this.materialBomId,
}).then(e => {
this.form.wmsRawOutstockDetailList = e.data.map(r => {
return {
@@ -607,13 +650,9 @@ export default {
})
})
},
- addMaterialRequisition() {
- this.addDialogVisible = false
- this.form.wmsRawOutstockDetailList.push(this.form2)
- },
+ // 申请领料
receiveMaterial() {
applyRawOutstock(this.form).then(e => {
- console.log(e)
if (e.code === 200) {
this.dialogVisible = false
this.$message({
@@ -623,9 +662,11 @@ export default {
}
})
},
+ // 物料搜索
searchMaterial(val) {
getMaterialBoms({
- ancestors: 1,
+ warehouseFloor:1,
+ ancestors: this.materialBomId,
materialName: val
}).then(e => {
this.form.wmsRawOutstockDetailList = e.data.map(r => {
@@ -737,4 +778,9 @@ export default {
bottom: 1.5%;
left: 2%;
}
+
+.roundBorder {
+ position: absolute;
+ transform: translate(-50%, -50%);
+}
diff --git a/hw-ui/src/views/board/fourthFloor/laserLight.vue b/hw-ui/src/views/board/fourthFloor/laserLight.vue
index 0fc334b9..0084d44c 100644
--- a/hw-ui/src/views/board/fourthFloor/laserLight.vue
+++ b/hw-ui/src/views/board/fourthFloor/laserLight.vue
@@ -19,16 +19,19 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
图纸下发
- 完成
+ 完成
@@ -118,25 +121,40 @@
width="120"
>
-
- 开始
-
- 开始
+
+
+
- 继续
-
+ 继续
+
退库
@@ -147,6 +165,15 @@
+
+
当日产量
@@ -165,14 +192,11 @@
-
+
-
-
-
-
-
+
+