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

rev:更新

Browse Source
This commit is contained in:
gengby
2024-02-18 11:09:46 +08:00
parent bbb76ddc84
commit 8e04672090
50 changed files with 2615 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
View File

@@ -10,19 +10,21 @@ import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.modules.common.exception.BadRequestException;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* @author zhangjiangwei
*/
@Service
@Component
@RequiredArgsConstructor
@Slf4j
public class AgvWaitUtil {
private final DeviceAppService deviceAppService;
private final DeviceExecuteLogService deviceExecuteLogService;
@Autowired
private DeviceAppService deviceAppService;
@Autowired
private DeviceExecuteLogService deviceExecuteLogService;
//取货前等待
public JSONObject waitInGet(String deviceCode) {
@@ -107,7 +109,6 @@ public class AgvWaitUtil {
}
if (device.getDeviceDriver() instanceof PhotoelectricDetectionDeviceDriver) {
// 诺力4期对接位驱动
PhotoelectricDetectionDeviceDriver driver = (PhotoelectricDetectionDeviceDriver) device.getDeviceDriver();
if (driver.getMove() == 0) {
String message = "允许AGV放货。";

4
acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
View File

@@ -10,8 +10,8 @@ import com.alibaba.fastjson.JSONObject;
*/
public enum DriverTypeEnum {
ORDINARY_SITE(1, "standard_ordinary_site", "普通站点", "station"),
PHOTOELECTRIC_DETECTION_DEVICE_DRIVER(2, "photoelectric_detection_station", "光电检测站点", "station");
STANDARD_STORAGE(2, "standard_storage", "标准版-货架", "storage"),
PHOTOELECTRIC_DETECTION_DEVICE_DRIVER(3, "photoelectric_detection_station", "光电检测站点", "station");
//驱动索引
private int index;
//驱动编码

4
acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -876,7 +876,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
celldto.setZ("0");
celldto.setAddress(0);
celldto.setCreate_by("init");
celldto.setCreate_time(SecurityUtils.getCurrentUsername());
celldto.setCreate_time(DateUtil.now());
wo.insert((JSONObject) JSONObject.toJSON(celldto));
}
}
@@ -892,7 +892,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
celldto.setZ("0");
celldto.setAddress(0);
celldto.setCreate_by("init");
celldto.setCreate_time(SecurityUtils.getCurrentUsername());
celldto.setCreate_time(DateUtil.now());
wo.insert((JSONObject) JSONObject.toJSON(celldto));
}
}

70
acs/nladmin-ui/src/views/acs/device/index.vue
View File

@@ -24,7 +24,7 @@
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value"/>
</el-select>
<el-select
v-model="query.region"
@@ -36,7 +36,7 @@
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in regions" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in regions" :key="item.id" :label="item.label" :value="item.value"/>
</el-select>
<el-select
v-model="query.is_config"
@@ -48,9 +48,9 @@
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in is_configs" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in is_configs" :key="item.id" :label="item.label" :value="item.value"/>
</el-select>
<rrOperation />
<rrOperation/>
</div>
<crudOperation :permission="permission">
<el-button
@@ -60,7 +60,8 @@
type="warning"
icon="el-icon-download"
@click="crud.doExport"
>导出模型</el-button>
>导出模型
</el-button>
<el-button
slot="right"
class="filter-item"
@@ -92,13 +93,13 @@
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item v-if="false" label="设备标识" prop="device_id">
<el-input v-model="form.device_id" style="width: 370px;" />
<el-input v-model="form.device_id" style="width: 370px;"/>
</el-form-item>
<el-form-item label="设备编码" prop="device_code">
<el-input v-model="form.device_code" style="width: 370px;" />
<el-input v-model="form.device_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="设备名字" prop="device_name">
<el-input v-model="form.device_name" style="width: 370px;" />
<el-input v-model="form.device_name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="设备类型" prop="device_type">
<el-select v-model="form.device_type" style="width: 370px" placeholder="请选择">
@@ -111,10 +112,14 @@
</el-select>
</el-form-item>
<el-form-item label="所属区域" prop="region">
<el-select v-model="form.region" style="width: 370px" placeholder="请选择">
<el-select
v-model="form.region"
style="width: 370px;"
filterable
placeholder="请选择"
>
<el-option
v-for="item in regions"
:key="item.id"
v-for="item in dict.region"
:label="item.label"
:value="item.value"
/>
@@ -131,7 +136,7 @@
</el-select>
</el-form-item>
<el-form-item label="顺序号" prop="seq_num">
<el-input-number v-model="form.seq_num" value="1" :min="1" label="描述文字" />
<el-input-number v-model="form.seq_num" value="1" :min="1" label="描述文字"/>
</el-form-item>
<!-- <el-form-item label="生产厂家">-->
<!-- <el-input v-model="form.manufacturer" style="width: 370px;" />-->
@@ -140,7 +145,7 @@
<!-- <el-input v-model="form.manufacturer_phone" style="width: 370px;" />-->
<!-- </el-form-item>-->
<el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -157,9 +162,9 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="device_id" label="设备标识" />
<el-table-column sortable prop="device_code" label="设备编码" />
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="device_id" label="设备标识"/>
<el-table-column sortable prop="device_code" label="设备编码"/>
<el-table-column sortable label="设备名字">
<template slot-scope="scope">
<div>{{ scope.row.device_name }}</div>
@@ -172,10 +177,10 @@
</el-table-column>
<el-table-column label="所属区域">
<template slot-scope="scope">
<div>{{ scope.row.region_name }}</div>
{{ dict.label.region[scope.row.region] }}
</template>
</el-table-column>
<el-table-column sortable prop="seq_num" label="顺序号" />
<el-table-column sortable prop="seq_num" label="顺序号"/>
<el-table-column prop="is_config" label="是否配置" width="75px">
<template slot-scope="scope">
<span v-if="scope.row.is_config=='true' ">是</span>
@@ -184,7 +189,7 @@
</el-table-column>
<!-- <el-table-column prop="manufacturer" label="生产厂家" />-->
<!-- <el-table-column prop="manufacturer_phone" label="厂家电话" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="remark" label="备注"/>
<el-table-column v-permission="['admin','device:edit','device:del']" label="操作" width="200px" align="center">
<template slot-scope="scope">
<udOperation
@@ -201,23 +206,23 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3"/>
</div>
</template>
<script>
import crudDevice from '@/api/acs/device/device'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import { get } from '@/api/system/dictDetail'
import {get} from '@/api/system/dictDetail'
import UploadDialog from '@/views/acs/device/UploadDialog'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import {download} from '@/api/data'
import {downloadFile} from '@/utils'
const defaultForm = {
manufacturer: null,
@@ -237,11 +242,11 @@ const defaultForm = {
region: null,
is_config: null,
remark: null,
region: null
}
export default {
name: 'Device',
components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog },
dicts: ['region'],
components: {pagination, crudOperation, rrOperation, udOperation, UploadDialog},
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -249,7 +254,7 @@ export default {
url: 'api/device',
idField: 'device_id',
sort: 'device_id,desc',
crudMethod: { ...crudDevice }
crudMethod: {...crudDevice}
})
},
data() {
@@ -264,19 +269,18 @@ export default {
is_configs: [],
uploadShow: false,
device_code: '',
regions: [],
rules: {
device_code: [
{ required: true, message: '设备编码不能为空', trigger: 'blur' }
{required: true, message: '设备编码不能为空', trigger: 'blur'}
],
device_name: [
{ required: true, message: '设备名字不能为空', trigger: 'blur' }
{required: true, message: '设备名字不能为空', trigger: 'blur'}
],
device_type: [
{ required: true, message: '设备类型不能为空', trigger: 'blur' }
{required: true, message: '设备类型不能为空', trigger: 'blur'}
],
region: [
{ required: true, message: '所属区域不能为空', trigger: 'blur' }
{required: true, message: '所属区域不能为空', trigger: 'blur'}
]
}
}