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

Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-08-22 10:18:31 +08:00
parent 02b1236ce8 e6646ecf92
commit 7c7ed6f1b1
8 changed files with 83 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
View File

@@ -1318,6 +1318,10 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
mode = "码垛强制完成";
} else if (this.getMode() == 8) {
mode = "申请空盘";
} else if (this.getMode() == 9) {
mode = "工单完成";
} else if (this.getMode() == 11) {
mode = "强制去包装";
}
if (this.getStatus() == 1) {

25
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
View File

@@ -440,10 +440,10 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
} else {
this.instruction_require_time = date;
JSONObject json = new JSONObject();
String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
String demosub = linkobj.substring(1,linkobj.length()-1);
String demoArray[] = demosub.split(",");
List<String> demoList = Arrays.asList(demoArray);
// String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
// String demosub = linkobj.substring(1,linkobj.length()-1);
// String demoArray[] = demosub.split(",");
// List<String> demoList = Arrays.asList(demoArray);
json.put("device_code",this.device_code);
json.put("material_code",material);
json.put("qty",encoder_qty);
@@ -475,10 +475,10 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
} else {
this.instruction_require_time = date;
JSONObject json = new JSONObject();
String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
String demosub = linkobj.substring(1,linkobj.length()-1);
String demoArray[] = demosub.split(",");
List<String> demoList = Arrays.asList(demoArray);
// String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code");
// String demosub = linkobj.substring(1,linkobj.length()-1);
// String demoArray[] = demosub.split(",");
// List<String> demoList = Arrays.asList(demoArray);
json.put("device_code",this.device_code);
json.put("material_code",material);
json.put("qty",encoder_qty);
@@ -515,6 +515,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
json.put("type","1");
json.put("material_code",material);
json.put("vehicle_code",barcode);
json.put("qty",encoder_qty);
json.put("is_full","1");
HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
if (ObjectUtil.isNotEmpty(result)) {
@@ -635,11 +636,17 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
} else if (this.getMode() == 2) {
mode = "联机";
} else if (this.getMode() == 4) {
mode = "叫料";
mode = "人工排产确认";
} else if (this.getMode() == 5) {
mode = "申请空盘";
} else if (this.getMode() == 6) {
mode = "申请入库";
} else if (this.getMode() == 7) {
mode = "码垛完成";
} else if (this.getMode() == 8) {
mode = "码垛强制完成";
} else if (this.getMode() == 9) {
mode = "工单完成";
}
if (this.getAction() == 0) {

10
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java
View File

@@ -1052,12 +1052,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
mode = "联机";
} else if (this.getMode() == 3) {
mode = "工作中";
} else if (this.getMode() == 4) {
mode = "工单确认";
} else if (this.getMode() == 5) {
mode = "获取托盘信息";
mode = "叫料出库";
} else if (this.getMode() == 6) {
mode = "拆垛完成";
} else if (this.getMode() == 7) {
mode = "申请空盘";
mode = "申请空盘入库";
} else if (this.getMode() == 9) {
mode = "工单完成";
}
String onoff_status = "";

12
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
View File

@@ -244,7 +244,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
break;
case 8:
//申请入窑
if(move ==1 && !requireSucess && StrUtil.isNotEmpty(this.barcode) && StrUtil.equals(this.getDevice().getExtraValue().get("apply_task").toString(),"true")){
if(move == 1 && !requireSucess && StrUtil.isNotEmpty(this.barcode) && StrUtil.equals(this.getDevice().getExtraValue().get("apply_task").toString(),"true")){
applyIn();
}
break;
@@ -340,7 +340,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
}
/**
* 申请入窑
* 申请入窑输送任务
*
* @param
*/
@@ -483,7 +483,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
}
/**
* 申请入库
* 申请入窑
*
* @param
*/
@@ -681,6 +681,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
mode = "申请空盘";
} else if (this.getMode() == 6) {
mode = "申请入库";
} else if (this.getMode() == 7) {
mode = "入窑输送任务";
} else if (this.getMode() == 8) {
mode = "申请入窑";
} else if (this.getMode() == 9) {
mode = "申请出窑";
}
if (this.getAction() == 0) {

3
acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -939,6 +939,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
instdto.setVehicle_type(vehicleType);
instructionservice.create(instdto);
acsTask.setTask_status("1");
this.update(acsTask);
}
@Override

20
acs/qd/src/views/acs/device/driver/lnsh/rljn_package_palletSplit_manipulator.vue
View File

@@ -97,7 +97,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="关联设备" prop="device_code">
<el-form-item label="关联下料设备" prop="device_code">
<el-select
v-model="form.link_device_code"
filterable
@@ -112,6 +112,21 @@
/>
</el-select>
</el-form-item>
<el-form-item label="关联上料设备" prop="device_code" label-width="200">
<el-select
v-model="form.link_device_code2"
multiple
filterable
reserveKeyword
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联三色灯" prop="device_code" label-width="100px">
@@ -297,7 +312,8 @@ export default {
manual_create_task: true,
is_pickup: true,
is_release: true,
link_device_code: []
link_device_code: [],
link_device_code2: []
},
rules: {}
}

11
acs/qd/src/views/system/logicflow/editor/components/Diagram.vue
View File

@@ -1,6 +1,7 @@
<template>
<div class="diagram">
<diagram-toolbar
style="z-index: 1"
v-if="lf"
class="diagram-toolbar"
:lf="lf"
@@ -37,6 +38,7 @@
:only-edge="activeNodes.length === 0"
:elements-style="properties"
:show-choice="showChoice"
:node="nodeObj"
@setStyle="$_setStyle"
@setZIndex="$_setZIndex"
/>
@@ -92,7 +94,8 @@ export default {
nodeSize: {
width: '',
heigh: ''
}
},
nodeObj: {} // 给子组件传递信息
}
},
mounted() {
@@ -182,11 +185,13 @@ export default {
},
// 获取可以进行设置的属性
$_getProperty() {
// console.log('选中')
console.log('选中')
let properties = {}
const { nodes, edges } = this.lf.getSelectElements()
// const graphModel = this.lf.graphModel
// console.log(graphModel)
console.log(nodes)
// 只传第一个,以第一个为显示是否绑定设备等信息，其余显示正常不用处理
this.nodeObj = nodes[0]
nodes.forEach(node => {
if (node.type === 'html-node') {
this.showChoice = true

20
acs/qd/src/views/system/logicflow/editor/components/PropertyPanel.vue
View File

@@ -160,6 +160,7 @@
size="mini"
:min="0"
:max="360"
:step="90"
@change="$_changeTransform"
/>
<span>度</span>
@@ -197,7 +198,8 @@ export default {
props: {
elementsStyle: Object,
onlyEdge: Boolean, // 是否是只设置边的属性，当只设置边的属性时，隐藏快捷样式和背景色设置
showChoice: Boolean
showChoice: Boolean,
node: Object // 父组件传来的对象
},
data() {
return {
@@ -236,6 +238,11 @@ export default {
this.style = { ...this.style, ...val }
},
immediate: true
},
node(newVal, oldVal) {
// newVal是新值，oldVal是旧值
this.node = newVal
this.cleanParam()
}
},
created() {
@@ -344,6 +351,17 @@ export default {
this.$emit('setStyle', {
device: val
})
},
cleanParam() { // 判断来清空下拉框
if (this.node.properties.device === undefined) {
this.style.device = ''
}
if (this.node.properties.imageUrl === undefined) {
this.style.imageUrl = ''
}
if (this.node.properties.transform === undefined) {
this.style.transform = 0
}
}
}
}