diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index f597d43..1fc1c6c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -11,6 +11,7 @@ import org.nl.acs.agv.AgvUtil; import org.nl.acs.config.AcsConfig; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.device_driver.lnsh.converor_barcode.ConveyorBarcodeDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol; import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver; @@ -1273,6 +1274,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (ObjectUtil.isEmpty(device)) { continue; } + if (device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver) { + ConveyorBarcodeDeviceDriver driver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver(); + status.put("mode", driver.getMode()); + status.put("error", driver.getError()); + status.put("move", driver.getMove()); + } if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { LnshPalletizingManipulatorSiteDeviceDriver driver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); status.put("mode", driver.getMode()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/KlMaterialInfoVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/KlMaterialInfoVo.java new file mode 100644 index 0000000..9e88f52 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/KlMaterialInfoVo.java @@ -0,0 +1,17 @@ +package org.nl.wms.cockpit.service.dao; + +import lombok.Data; + +/** + * @author Administrator + * 点位信息（对接位、货架） + */ +@Data +public class KlMaterialInfoVo { + private String pointStatus; + private String pointName; + private String pointCode; + private String materialWeight; + private String lastStandingTime; + private String materialCode; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index adef066..ac39ca1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -389,7 +389,7 @@ public class CockpitServiceImpl implements CockpitService { return null; }); // 困料货架的信息显示 - CompletableFuture> trappedMaterialShelfTask = CompletableFuture.supplyAsync(() -> { + CompletableFuture> trappedMaterialShelfTask = CompletableFuture.supplyAsync(() -> { return cockPitMapper.selectKlhwInfo(); }, pool); trappedMaterialShelfTask.thenAccept(result -> { @@ -522,30 +522,64 @@ public class CockpitServiceImpl implements CockpitService { @Override public List selectInOutKilnDetail() { -// List points = new ArrayList<>(); -// points.add("RYHCX01"); -// points.add("CYHCX01"); -// JSONArray pointsParam = new JSONArray(Collections.singletonList(points)); -// AcsResponse response = wmsToAcsService.getDeviceStatus(pointsParam); -// JSONArray data = ObjectUtil.isNotEmpty(response) ? response.getData() : pointsParam; - //todo 确定每托盘数量 + List points = new ArrayList<>(); + points.add("RYHCX01"); + points.add("CYHCX01"); + JSONArray pointsParam = new JSONArray(Collections.singletonList(points)); + AcsResponse response = wmsToAcsService.getDeviceStatus(pointsParam); + JSONArray data = ObjectUtil.isNotEmpty(response) ? response.getData() : pointsParam; List res = new ArrayList<>(); - InOutKilnVo in = cockPitMapper.selectInKilnInfo(); - in.setStat("2"); - in.setPointName("入窑输送线"); - in.setWorkTime("3.5"); - in.setMaterialNum("25000"); - InOutKilnVo out = cockPitMapper.selectOutKilnInfo(); - if (null == out) { - out = new InOutKilnVo(); + for (int i = 0; i < data.size(); i++) { + JSONObject object = data.getJSONObject(i); + if ("RYHCX01".equals(object.getString("device_code"))){ + InOutKilnVo in = cockPitMapper.selectInKilnInfo(); + if (null == in) { + in = new InOutKilnVo(); + } + if ("0".equals(object.getString("error"))){ + in.setStat("2"); + }else { + in.setStat("1"); + } + in.setPointName("入窑输送线"); +// in.setWorkTime("3.5"); + res.add(in); + } + if ("CYHCX01".equals(object.getString("device_code"))){ + InOutKilnVo out = cockPitMapper.selectOutKilnInfo(); + if (null == out) { + out = new InOutKilnVo(); + } + if ("0".equals(object.getString("error"))){ + out.setStat("2"); + }else { + out.setStat("1"); + } + out.setPointName("出窑输送线"); +// out.setWorkTime("3.5"); +// out.setMaterialNum("25000"); +// out.setDeliveredMaterialNum("25000"); + res.add(out); + } } - out.setStat("2"); - out.setPointName("出窑输送线"); - out.setWorkTime("3.5"); - out.setMaterialNum("25000"); - out.setDeliveredMaterialNum("25000"); - res.add(in); - res.add(out); +// //todo 确定每托盘数量 +// List res = new ArrayList<>(); +// InOutKilnVo in = cockPitMapper.selectInKilnInfo(); +// in.setStat("2"); +// in.setPointName("入窑输送线"); +// in.setWorkTime("3.5"); +// in.setMaterialNum("25000"); +// InOutKilnVo out = cockPitMapper.selectOutKilnInfo(); +// if (null == out) { +// out = new InOutKilnVo(); +// } +// out.setStat("2"); +// out.setPointName("出窑输送线"); +// out.setWorkTime("3.5"); +// out.setMaterialNum("25000"); +// out.setDeliveredMaterialNum("25000"); +// res.add(in); +// res.add(out); return res; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java index 47c6743..38e50ab 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java @@ -58,7 +58,7 @@ public interface CockPitMapper { List queryKlInfoList(); - List selectKlhwInfo(); + List selectKlhwInfo(); List selectYzslwPoint(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml index 8b0a18a..e1a4606 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml @@ -156,6 +156,7 @@ produceDate ORDER BY produceDate DESC + limit 7 - + SELECT p.point_code AS pointCode, + p.point_name AS pointName, + p.point_status AS pointStatus, + if(g.material_weight > 0.00, g.material_weight, 0.00) AS materialWeight, + IF + ( + TIMESTAMPDIFF( + MINUTE, g.instorage_time, + NOW()) >= g.standing_time, + 0, + g.standing_time - TIMESTAMPDIFF( + MINUTE, g.instorage_time, + NOW()) + ) AS lastStandingTime, + g.redundance_material_code as materialCode FROM `sch_base_point` p - WHERE p.region_code ='KL' - and p.point_code not like 'CBJ%' + LEFT JOIN sch_base_vehiclematerialgroup g ON p.point_code = g.point_code + WHERE p.region_code = 'KL' + AND p.point_code NOT LIKE 'CBJ%' ORDER BY p.point_code