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

add: 添加创建任务的字段

Browse Source
This commit is contained in:
yanps
2023-12-13 15:55:28 +08:00
parent b517f41682
commit d3dbb4191f
3 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java
View File

@@ -108,6 +108,8 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
int qty = 0;
int last_qty = 0;
int out_finish = 0;
//下发命令
int to_command = 0;
@@ -400,7 +402,36 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
@Override
public JSONObject getDeviceStatusName() throws Exception {
return null;
JSONObject jo = new JSONObject();
String mode = "";
String move = "";
if (this.getMode() == 0) {
mode = "未联机";
} else if (this.getMode() == 1) {
mode = "单机";
} else if (this.getMode() == 2) {
mode = "联机";
} else if (this.getMode() == 3) {
mode = "运行中";
} else if (this.getMode() == 4) {
mode = "套管完成";
}
if(this.getMove() ==0){
move = "无货";
}else if(this.getMove() == 1){
move = "有托盘";
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));
jo.put("move", move);
jo.put("inventory_qty", qty);
jo.put("out_finish", out_finish);
jo.put("material", material1);
jo.put("isOnline", this.getIsonline());
return jo;
}
@Override

15
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
View File

@@ -688,6 +688,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
public JSONObject getDeviceStatusName() {
JSONObject jo = new JSONObject();
String mode = "";
String move = "";
if (this.getMode() == 0) {
mode = "未联机";
@@ -696,16 +697,22 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
} else if (this.getMode() == 2) {
mode = "联机";
} else if (this.getMode() == 3) {
mode = "入库中";
mode = "运行中";
} else if (this.getMode() == 4) {
mode = "出库中";
mode = "申请出纸管";
}
if(this.getMove() == 0){
move = "无货";
}else if(this.getMove() == 1){
move = "有托盘";
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));
jo.put("inventory_qty", inventory_qty);
jo.put("inventory_qty", item_qty1);
jo.put("move", move);
jo.put("out_finish", out_finish);
jo.put("material", material);
jo.put("material", item_material1);
jo.put("isOnline", this.getIsonline());
return jo;

22
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -80,8 +80,8 @@
<!-- </el-button>-->
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 370px;" />
</el-form-item>
@@ -306,6 +306,18 @@
<el-form-item v-if="form.task_type === '4'" label="放货高度" prop="next_height">
<el-input v-model="form.next_height" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="行架任务类型">
<el-input v-model="form.truss_type" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="气胀轴代数">
<el-input v-model="form.version" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="套管数量">
<el-input v-model="form.bushing_num" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="是否套轴">
<el-input v-model="form.is_bushing" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" @change="isDisabled=false" />
</el-form-item>
@@ -505,7 +517,11 @@ export default {
to_z: null,
agv_system_type: '',
next_height: '0',
start_height: '0'
start_height: '0',
truss_type: null,
version: null,
bushing_num: null,
is_bushing: null
},
rules: {
start_height: [