root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2023-04-18 14:02:15 +08:00
parent 8bf407e5f0
commit ad64980050
8 changed files with 589 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java
View File

@@ -104,5 +104,26 @@ public class WmsToAcsController {
return new ResponseEntity<>(wmsToAcsService.putPlusPullAction(jo), HttpStatus.OK);
}
@PostMapping("/unLock")
@Log(value = "给ACS下发修立库点位解锁", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
@ApiOperation("给ACS下发修立库点位解锁")
public ResponseEntity<Object> unLock(@RequestBody JSONObject jo) {
return new ResponseEntity<>(wmsToAcsService.unLock(jo), HttpStatus.OK);
}
@PostMapping("/queryDeviceInfo")
@Log(value = "LMS向acs请求设备信息", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
@ApiOperation("LMS向acs请求设备信息")
public ResponseEntity<Object> queryDeviceInfo(@RequestBody JSONObject jo) {
return new ResponseEntity<>(wmsToAcsService.queryDeviceInfo(jo), HttpStatus.OK);
}
@PostMapping("/sendAgvChargeTask")
@Log(value = "LMS下发AGV充电任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
@ApiOperation("LMS下发AGV充电任务")
public ResponseEntity<Object> sendAgvChargeTask(@RequestBody JSONObject jo) {
return new ResponseEntity<>(wmsToAcsService.sendAgvChargeTask(jo), HttpStatus.OK);
}
}

19
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java
View File

@@ -77,5 +77,24 @@ public interface WmsToAcsService {
*/
JSONObject putPlusPullAction(JSONObject jo);
/**
* 给ACS下发修立库点位解锁
* @param jo /
* @return JSONObject
*/
JSONObject unLock(JSONObject jo);
/**
* lms向acs请求设备信息
* @param jo /
* @return JSONObject
*/
JSONObject queryDeviceInfo(JSONObject jo);
/**
* LMS下发AGV充电任务
* @param jo /
* @return JSONObject
*/
JSONObject sendAgvChargeTask(JSONObject jo);
}

221
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
View File

@@ -111,4 +111,225 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
return result;
}
@Override
public JSONObject unLock(JSONObject whereJson) {
String api = "api/wms/unLock";
//判断是否连接ACS系统
String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue();
JSONObject result = new JSONObject();
if (StrUtil.equals("0", isConnect)) {
result.put("status", HttpStatus.OK.value());
result.put("message", "下发成功，但未连接ACS!");
result.put("data", new JSONObject());
return result;
}
//ACS地址：127.0.0.1:8010
String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue();
String url = acsUrl + api;
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(whereJson))
.execute().body();
result = JSONObject.parseObject(resultMsg);
} catch (Exception e) {
String msg = e.getMessage();
//ConnectException: Connection refused: connect
//网络不通
System.out.println(msg);
result.put("status", HttpStatus.BAD_REQUEST);
result.put("message", "网络不通,操作失败!");
result.put("data", new JSONObject());
}
//acs抛异常这里
if (!StrUtil.equals(result.getString("status"), "200")) {
throw new BadRequestException("解锁失败："+result.getString("message"));
}
return result;
}
/*
对应车间：
A1车间对应车号：2,3
A2车间对应车号：
A3车间对应车号：
A4车间对应车号：
LK车间对应车号：1
*/
@Override
public JSONObject queryDeviceInfo(JSONObject whereJson) {
String api = "api/wms/queryDeviceInfo";
//判断是否连接ACS系统
String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue();
JSONObject result = new JSONObject();
if (StrUtil.equals("0", isConnect)) {
result.put("status", HttpStatus.OK.value());
result.put("message", "下发成功，但未连接ACS!");
result.put("data", new JSONArray());
/* // 测试数据
JSONArray data = result.getJSONArray("data");
JSONObject a = new JSONObject();
a.put("electricity", "86");
a.put("status_name", "空闲");
a.put("car_no", "1");
a.put("task_code", "");
a.put("fault", "");
data.add(a);
JSONObject b = new JSONObject();
b.put("electricity", "13");
b.put("status_name", "执行中");
b.put("car_no", "2");
b.put("task_code", "000001");
b.put("fault", "取货失败");
data.add(b);
JSONObject c = new JSONObject();
c.put("electricity", "100");
c.put("status_name", "充电中");
c.put("car_no", "3");
c.put("task_code", "000002");
c.put("fault", "");
data.add(c);
JSONObject nowJson = new JSONObject(); // 返回数据
JSONArray ArrA1 = new JSONArray(); // A1车间
JSONArray ArrLk = new JSONArray(); // LK车间
for (int i = 0; i < data.size(); i++) {
JSONObject json = data.getJSONObject(i);
if ("2,3".contains(json.getString("car_no"))) {
ArrA1.add(json);
}
if ("1".contains(json.getString("car_no"))) {
ArrLk.add(json);
}
}
nowJson.put("jsonA1",ArrA1);
nowJson.put("jsonLK",ArrLk);
result.put("data", nowJson);*/
return result;
}
//ACS地址：127.0.0.1:8010
String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue();
String url = acsUrl + api;
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(whereJson))
.execute().body();
result = JSONObject.parseObject(resultMsg);
// 重新组织数据
JSONArray data = result.getJSONArray("data");
JSONObject nowJson = new JSONObject(); // 返回数据
JSONArray ArrA1 = new JSONArray(); // A1车间
JSONArray ArrLk = new JSONArray(); // LK车间
for (int i = 0; i < data.size(); i++) {
JSONObject json = data.getJSONObject(i);
if ("2,3".contains(json.getString("car_no"))) {
ArrA1.add(json);
}
if ("1".contains(json.getString("car_no"))) {
ArrLk.add(json);
}
}
nowJson.put("jsonA1",ArrA1);
nowJson.put("jsonLK",ArrLk);
result.put("data", nowJson);
} catch (Exception e) {
String msg = e.getMessage();
//ConnectException: Connection refused: connect
//网络不通
System.out.println(msg);
result.put("status", HttpStatus.BAD_REQUEST);
result.put("message", "网络不通,操作失败!");
result.put("data", new JSONArray());
}
//acs抛异常这里
if (!StrUtil.equals(result.getString("status"), "200")) {
throw new BadRequestException("查询失败："+result.getString("message"));
}
return result;
}
/*
对应系统：
车号1对应系统：1
车号2、3对应系统：2
*/
@Override
public JSONObject sendAgvChargeTask(JSONObject whereJson) {
String api = "api/wms/sendAgvChargeTask";
//判断是否连接ACS系统
String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue();
JSONObject result = new JSONObject();
if (StrUtil.equals("0", isConnect)) {
result.put("status", HttpStatus.OK.value());
result.put("message", "下发成功，但未连接ACS!");
result.put("data", new JSONObject());
/* // 测试数据
String car_no = whereJson.getString("car_no");
JSONObject jsonParam = new JSONObject();
if ("2,3".contains(car_no)) {
jsonParam.put("avg_system", "2");
jsonParam.put("car_no", car_no);
} else if ("1".contains(car_no)) {
jsonParam.put("avg_system", "1");
jsonParam.put("car_no", car_no);
}*/
return result;
}
//ACS地址：127.0.0.1:8010
String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue();
String url = acsUrl + api;
// 判断此此号属于哪个系统
String car_no = whereJson.getString("car_no");
JSONObject jsonParam = new JSONObject();
if ("2,3".contains(car_no)) {
jsonParam.put("avg_system", "2");
jsonParam.put("car_no", car_no);
} else if ("1".contains(car_no)) {
jsonParam.put("avg_system", "1");
jsonParam.put("car_no", car_no);
}
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(jsonParam))
.execute().body();
result = JSONObject.parseObject(resultMsg);
} catch (Exception e) {
String msg = e.getMessage();
//网络不通
System.out.println(msg);
result.put("status", HttpStatus.BAD_REQUEST);
result.put("message", "网络不通,操作失败!");
result.put("data", new JSONObject());
}
//acs抛异常这里
if (!StrUtil.equals(result.getString("status"), "200")) {
throw new BadRequestException("下发失败："+result.getString("message"));
}
return result;
}
}

BIN
lms/nladmin-ui/src/assets/images/home_agv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

110
lms/nladmin-ui/src/views/wms/agvrush/charge/BarChart.vue Normal file
View File

@@ -0,0 +1,110 @@
<template>
<div :class="className" :style="{height:height,width:width}" />
</template>
<script>
import echarts from 'echarts'
require('echarts/theme/macarons') // echarts theme
import { debounce } from '@/utils'
export default {
props: {
className: {
type: String,
default: 'chart'
},
width: {
type: String,
default: '100%'
},
height: {
type: String,
default: '380px'
},
chartData: {
type: Object,
required: true
}
},
data() {
return {
chart: null
}
},
watch: {
chartData: {
deep: true,
handler(val) {
this.setOptions(val)
}
}
},
mounted() {
this.initChart()
this.__resizeHandler = debounce(() => {
if (this.chart) {
this.chart.resize()
}
}, 100)
window.addEventListener('resize', this.__resizeHandler)
},
beforeDestroy() {
if (!this.chart) {
return
}
window.removeEventListener('resize', this.__resizeHandler)
this.chart.dispose()
this.chart = null
},
methods: {
initChart() {
this.chart = echarts.init(this.$el, 'macarons')
this.setOptions(this.chartData)
},
setOptions({ expectedData, actualData } = {}) {
this.chart.setOption({
title: {
text: '一周任务数'
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: [
{
type: 'category',
data: expectedData,
axisTick: {
alignWithLabel: true
}
}
],
yAxis: [
{
type: 'value'
}
],
series: [
{
name: '任务数',
type: 'bar',
barWidth: '60%',
data: actualData,
itemStyle: {
color: 'green'
}
}
]
})
}
}
}
</script>

17
lms/nladmin-ui/src/views/wms/agvrush/charge/chargeQuery.js Normal file
View File

@@ -0,0 +1,17 @@
import request from '@/utils/request'
export function queryDeviceInfo(data) { // 获取设备信息
return request({
url: 'api/wms/task/queryDeviceInfo',
method: 'post',
data: data
})
}
export function sendAgvChargeTask(data) { // 下发AGV充电任务
return request({
url: 'api/wms/task/sendAgvChargeTask',
method: 'post',
data: data
})
}

201
lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue Normal file
View File

@@ -0,0 +1,201 @@
<template>
<div style="background-color: rgb(240, 242, 245); padding-top: 10px;padding-bottom: 10px">
<div style="margin-top: 20px;margin-left: 30px">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="车间区域">
<el-select
v-model="form.flag"
size="mini"
placeholder="请选择"
class="filter-item"
@change="changeFlag"
>
<el-option
v-for="item in agvRegionList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
</div>
<el-row :gutter="24" style="margin-top: 10px; margin-left: 10px; margin-right: 10px; margin-bottom: 500px">
<el-col :span="18" style="margin-left: 150px; margin-right: 150px; margin-top: 50px">
<el-col v-for="agvObj in agvList" :span="24/agvList.length">
<el-card>
<!-- <div v-if="agvObj.car_no === '' || agvObj.car_no == null" class="grid-content bg-purple" style="height: 250px;background-color: white;border-bottom:3px solid rgb(240, 242, 245)">-->
<!-- 请添加更多AGV设备-->
<!-- </div>-->
<div v-if="agvObj.car_no !== '' && agvObj.car_no != null" class="grid-content bg-purple" style="height: 350px;background-color: white;border-bottom:0px solid rgb(240, 242, 245)">
<el-row>
<el-col :span="8">
<img
:src="require('@/assets/images/home_agv.png')"
alt=""
width="50px"
height="50px;"
style="margin-top: 10px;margin-left: 50px; vertical-align:bottom;transform: rotate(0deg);"
>
</el-col>
<el-col :span="16">
<div class="grid-content bg-purple" style="height: 70px; font-size: 30px; text-align: center;line-height: 70px;">{{ agvObj.car_no }}
</div>
</el-col>
</el-row>
<el-row>
<div class="grid-content bg-purple" style="height: 50px;">
<el-col :span="8" style="line-height: 40px; text-align: center">
电量：
</el-col>
<el-col :span="16">
<el-progress v-if="agvObj.electricity<=30" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="exception" style="margin-top: 7px; margin-right: 5px;"/>
<el-progress v-if="agvObj.electricity>30 && agvObj.electricity<100" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="warning" style="margin-top: 7px; margin-right: 5px;"/>
<el-progress v-if="agvObj.electricity == 100" :text-inside="true" :stroke-width="25" :percentage="agvObj.electricity" status="success" style="margin-top: 7px; margin-right: 5px;"/>
</el-col>
</div>
</el-row>
<el-row>
<div class="grid-content bg-purple" style="height: 50px;">
<el-col :span="8" style="line-height: 40px; text-align: center">
状态：
</el-col>
<el-col :span="16" style="line-height: 40px; text-align: center">
{{ agvObj.status_name }}
</el-col>
</div>
</el-row>
<el-row>
<div class="grid-content bg-purple" style="height: 50px;">
<el-col :span="8" style="line-height: 40px; text-align: center">
任务：
</el-col>
<el-col :span="16" style="line-height: 40px; text-align: center">
{{ agvObj.task_code }}
</el-col>
</div>
</el-row>
<el-row>
<div class="grid-content bg-purple" style="height: 50px;">
<el-col :span="8" style="line-height: 40px; text-align: center">
报警：
</el-col>
<el-col :span="16" style="line-height: 40px; text-align: center">
{{ agvObj.fault }}
</el-col>
</div>
</el-row>
<el-row>
<div v-if="form.flag === '5'" class="grid-content bg-purple" style="padding-left: 400px; padding-top: 30px">
<el-button
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="charge_task(agvObj)"
>
AGV充电
</el-button>
</div>
<div v-if="form.flag !== '5'" class="grid-content bg-purple" style="padding-left: 160px; padding-top: 30px">
<el-button
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="charge_task(agvObj)"
>
AGV充电
</el-button>
</div>
</el-row>
</div>
</el-card>
</el-col>
</el-col>
</el-row>
</div>
</template>
<script>
import { queryDeviceInfo, sendAgvChargeTask } from '@/views/wms/agvrush/charge/chargeQuery'
export default {
name: 'Dashboard',
components: {},
data() {
return {
form: {
flag: '1'
},
listA1: [],
listLk: [],
agvList: [
],
agvRegionList: [
{ 'label': 'A1', 'value': '1' },
{ 'label': 'A2', 'value': '2' },
{ 'label': 'A3', 'value': '3' },
{ 'label': 'A4', 'value': '4' },
{ 'label': 'LK', 'value': '5' }
]
}
},
mounted() {
this.init()
},
beforeDestroy() {
// js提供的clearInterval方法用来清除定时器
console.log('定时器销毁')
clearInterval(this.timer)
},
methods: {
init() {
this.initStatus()
this.timer = setInterval(() => { // 定时刷新
console.log('定时器启动')
this.initStatus()
}, 10000)
},
initStatus() {
const data = {
'region_code': this.form.flag
}
queryDeviceInfo(data).then(res => {
this.listA1 = res.data.jsonA1
this.listLk = res.data.jsonLK
this.changeFlag(this.form.flag)
})
},
changeFlag(val) {
if (val === '1') {
this.agvList = this.listA1
} else if (val === '5') {
this.agvList = this.listLk
} else {
this.agvList = []
}
},
charge_task(data) {
sendAgvChargeTask(data).then(res => {
this.$message({
message: '下发成功',
type: 'success'
})
})
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
</style>

1
lms/nladmin-ui/src/views/wms/sendout/outone/index.vue
View File

@@ -138,7 +138,6 @@ export default {
// 展开显示设备信息 todo: 1
if (data.data.type !== 'pro-rect' && data.data.type !== 'pro-circle' && data.data.type !== 'triangle' && data.data.type !== 'rect-radius') {
if (data.data.properties.struct_id) {
debugger
this.moveShow(data.data) // 传递节点数据，用来获取id做比对
this.dialogDeviceMsgVisible = true
this.struct_id = data.data.properties.struct_id // ?暂时没用