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

rev 修复删除设备报错 分页显示问题

Browse Source
This commit is contained in:
gengby
2023-05-17 17:26:50 +08:00
parent 30db992ada
commit a72caf0a31
10 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,11 +27,11 @@ public enum DriverTypeEnum {
INSPECT_CONVEYOR_MONITOR(9, "standard_conveyor_monitor", "标准版-输送机-监控点", "conveyor"), INSPECT_CONVEYOR_MONITOR(9, "standard_conveyor_monitor", "标准版-输送机-监控点", "conveyor"),
HAILIANG_PACKING(10, "hailiang_packing", "海亮包装项目-包装机", "conveyor"), //HAILIANG_PACKING(10, "hailiang_packing", "海亮包装项目-包装机", "conveyor"),
HAILIANG_LABELING(11, "hailiang_labeling", "海亮包装项目-贴标机", "conveyor"), //HAILIANG_LABELING(11, "hailiang_labeling", "海亮包装项目-贴标机", "conveyor"),
HAILIANG_COATING(12, "hailiang_coating", "海亮包装项目-裹膜机", "conveyor"), //HAILIANG_COATING(12, "hailiang_coating", "海亮包装项目-裹膜机", "conveyor"),
HAILIANG_SPECIAL_EMPTY_STATION(13, "hailiang_special_empty_station", "海亮专机空料点", "conveyor"), HAILIANG_SPECIAL_EMPTY_STATION(13, "hailiang_special_empty_station", "海亮专机空料点", "conveyor"),
@@ -61,17 +61,17 @@ public enum DriverTypeEnum {
HAILIANG_PACKER_STATION(26, "hailiang_packer_station", "海亮-包装机工位", "conveyor"), HAILIANG_PACKER_STATION(26, "hailiang_packer_station", "海亮-包装机工位", "conveyor"),
HAILIANG_XJ_PLC_TEST(27, "hailiang_xj_plc_test", "海亮-信捷PLC", "conveyor"), //HAILIANG_XJ_PLC_TEST(27, "hailiang_xj_plc_test", "海亮-信捷PLC", "conveyor"),
HAILIANG_SMART_PLC_TEST(28, "hailiang_smart_plc_test", "海亮-西门子SMART200PLC", "conveyor"), //HAILIANG_SMART_PLC_TEST(28, "hailiang_smart_plc_test", "海亮-西门子SMART200PLC", "conveyor"),
HAILIANG_THREESTATION_SMART(29, "hailiang_threestation_smart", "海亮-三工位Smart200", "conveyor"), //HAILIANG_THREESTATION_SMART(29, "hailiang_threestation_smart", "海亮-三工位Smart200", "conveyor"),
HAILIANG_FOLDINGDISC_SMART(30, "hailiang_foldingDisc_smart", "海亮-叠盘位Smart200", "conveyor"), //HAILIANG_FOLDINGDISC_SMART(30, "hailiang_foldingDisc_smart", "海亮-叠盘位Smart200", "conveyor"),
HAILIANG_ELEVATOR_WIRING(31, "hailiang_elevator_wiring", "海亮-货梯对接线", "conveyor"), //HAILIANG_ELEVATOR_WIRING(31, "hailiang_elevator_wiring", "海亮-货梯对接线", "conveyor"),
HAILIANG_PAINT_LINE(32, "hailiang_paint_line", "海亮-油漆线", "conveyor"), //HAILIANG_PAINT_LINE(32, "hailiang_paint_line", "海亮-油漆线", "conveyor"),
HAILIANG_STACKING_STATION(33, "hailiang_stacking_station", "海亮-包装线体", "conveyor"), HAILIANG_STACKING_STATION(33, "hailiang_stacking_station", "海亮-包装线体", "conveyor"),

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

@@ -247,6 +247,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
Device device = iterator.next(); Device device = iterator.next();
if (StrUtil.equals(device.getDevice_code(), device_code)) { if (StrUtil.equals(device.getDevice_code(), device_code)) {
iterator.remove(); iterator.remove();
break;
} }
} }
@@ -255,7 +256,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
log.info("设备删除成功!"); log.info("设备删除成功!");
if (deviceByCode != null) { if (deviceByCode != null) {
if (StrUtil.equals("storage", deviceByCode.getDeviceDriverDefination().getFitDeviceTypes().get(0).name())) { if (ObjectUtil.isNotEmpty(deviceByCode.getDeviceDriverDefination()) && StrUtil.equals("storage", deviceByCode.getDeviceDriverDefination().getFitDeviceTypes().get(0).name())) {
storageTab.delete("substring_index( storage_code,'-',1)= '" + device_code + "'"); storageTab.delete("substring_index( storage_code,'-',1)= '" + device_code + "'");
} else { } else {
@@ -1332,6 +1333,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
if (StrUtil.equals(storageCellDto.getStorage_code(), dto.getStorage_code())) { if (StrUtil.equals(storageCellDto.getStorage_code(), dto.getStorage_code())) {
storageCells.remove(storageCellDto); storageCells.remove(storageCellDto);
storageCells.add(dto); storageCells.add(dto);
break;
} }
} }
} }
@@ -1592,11 +1594,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
String datatype = jo.getString("extra_name"); String datatype = jo.getString("extra_name");
//西门子200 //西门子200
if (!datatype.contains(".")) { if (!datatype.contains(".")) {
String[] split = datatype.split(""); if (datatype.startsWith("VD")) {
if (split[1].equals("W")) {
datatype = "Word";
} else if (split[1].equals("D")) {
datatype = "DWord"; datatype = "DWord";
} else if (datatype.startsWith("VW")) {
datatype = "Word";
} else if (datatype.startsWith("V")) {
datatype = "Boolean";
} }
} else { } else {
datatype = "Boolean"; datatype = "Boolean";

1
wcs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
View File

@@ -140,7 +140,6 @@ public class StorageCellServiceImpl implements StorageCellService {
JSONObject json = (JSONObject) JSONObject.toJSON(dto); JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.update(json); wo.update(json);
deviceService.updateDeviceCodeByAddress(dto); deviceService.updateDeviceCodeByAddress(dto);
} }
@Override @Override

13
wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -131,7 +131,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
.collect(Collectors.toList()); .collect(Collectors.toList());
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("content", instructionList); jo.put("content", instructionList);
jo.put("totalElements", instructionList.size()); jo.put("totalElements", this.instructions.size());
return jo; return jo;
} }
@@ -1092,6 +1092,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
.orElse(new CopyOnWriteArrayList<>()) .orElse(new CopyOnWriteArrayList<>())
.stream() .stream()
.filter(i -> i.getLink_num().equals(link_no)) .filter(i -> i.getLink_num().equals(link_no))
.sorted((inst1, inst2) -> inst1.getInstruction_code().compareTo(inst2.getInstruction_code()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@@ -1326,9 +1327,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
if (putDevice != null) { if (putDevice != null) {
if (startDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { if (startDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) startDevice.getDeviceDriver(); hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) startDevice.getDeviceDriver();
if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0) {
throw new BadRequestException("缓存线已存在任务,稍后下发!"); throw new BadRequestException("缓存线已存在任务,稍后下发!");
} else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { } else if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) {
//下发电气单出 //下发电气单出
to_task_type = "4"; to_task_type = "4";
} }
@@ -1341,12 +1342,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
if (putDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { if (putDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) putDevice.getDeviceDriver(); hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) putDevice.getDeviceDriver();
if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0) {
throw new BadRequestException("缓存线已存在任务,稍后下发!"); throw new BadRequestException("缓存线已存在任务,稍后下发!");
} else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) {
//下发电气单入 //下发电气单入
to_task_type = "2"; to_task_type = "2";
} else if (tasksByLinNum.size() == 2 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) { } else if (tasksByLinNum.size() == 2 && hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) {
//下发电气双入 //下发电气双入
to_task_type = "3"; to_task_type = "3";
} }

2
wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -118,7 +118,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
.collect(Collectors.toList()); .collect(Collectors.toList());
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("content", orderList); jo.put("content", orderList);
jo.put("totalElements", orderList.size()); jo.put("totalElements", this.order.size());
return jo; return jo;
} }

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

@@ -176,7 +176,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
.collect(Collectors.toList()); .collect(Collectors.toList());
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("content", taskList); jo.put("content", taskList);
jo.put("totalElements", taskList.size()); jo.put("totalElements", this.tasks.size());
return jo; return jo;
} }

6
wcs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -127,9 +127,9 @@
{{ dict.label.send_status[scope.row.send_status] }} {{ dict.label.send_status[scope.row.send_status] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="100" /> <el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="120" />
<el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="100" /> <el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="120" />
<el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="100" /> <el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="120" />
<el-table-column prop="execute_status" label="执行状态" show-overflow-tooltip width="100"> <el-table-column prop="execute_status" label="执行状态" show-overflow-tooltip width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.execute_status[scope.row.execute_status] }} {{ dict.label.execute_status[scope.row.execute_status] }}

8
wcs/nladmin-ui/src/views/acs/order/index.vue
View File

@@ -158,10 +158,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="qty" label="生产数量" min-width="100" show-overflow-tooltip /> <el-table-column prop="qty" label="生产数量" min-width="100" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编号" min-width="100" show-overflow-tooltip /> <el-table-column prop="device_code" label="设备编号" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" min-width="100" show-overflow-tooltip /> <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip /> <el-table-column prop="material_name" label="物料名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_spec" label="规格型号" min-width="100" show-overflow-tooltip /> <el-table-column prop="material_spec" label="规格型号" min-width="120" show-overflow-tooltip />
<el-table-column prop="one_qty" label="满框数量" min-width="100" show-overflow-tooltip /> <el-table-column prop="one_qty" label="满框数量" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_needmove" label="是否AGV搬运" min-width="120" show-overflow-tooltip> <el-table-column prop="is_needmove" label="是否AGV搬运" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">

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

@@ -350,9 +350,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="link_num" show-overflow-tooltip label="关联编号" width="100" /> <el-table-column prop="link_num" show-overflow-tooltip label="关联编号" width="100" />
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="100" /> <el-table-column prop="priority" label="优先级" show-overflow-tooltip width="100" />
<el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="100px" /> <el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="120px" />
<el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="120px" /> <el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="120px" />
<el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="100px" /> <el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="120px" />
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="110" /> <el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="110" />
<el-table-column prop="quantity" label="数量" show-overflow-tooltip width="100" /> <el-table-column prop="quantity" label="数量" show-overflow-tooltip width="100" />
<el-table-column prop="agv_system_type" label="AGV系统类型" show-overflow-tooltip width="110px"> <el-table-column prop="agv_system_type" label="AGV系统类型" show-overflow-tooltip width="110px">

2
wcs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -660,7 +660,7 @@ export default {
} else if (val === 'storage_stock_num') { } else if (val === 'storage_stock_num') {
const obj = { name: '倒料位数量', value: data[val] } const obj = { name: '倒料位数量', value: data[val] }
this.arr.push(obj) this.arr.push(obj)
} else if (val === 'now_order_prod_num') { } else if (val === 'now_one_box_num') {
const obj = { name: '当前箱数量（每框实时)', value: data[val] } const obj = { name: '当前箱数量（每框实时)', value: data[val] }
this.arr.push(obj) this.arr.push(obj)
} else if (val === 'order_prod_allnum') { } else if (val === 'order_prod_allnum') {