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 38a81ff..2281d88 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 @@ -519,7 +519,7 @@ public class CockpitServiceImpl implements CockpitService { //todo 确定每托盘数量 List res = new ArrayList<>(); InOutKilnVo in = cockPitMapper.selectInKilnInfo(); - in.setStat("1"); + in.setStat("2"); in.setPointName("入窑输送线"); in.setWorkTime("3.5"); in.setMaterialNum("25000"); @@ -527,7 +527,7 @@ public class CockpitServiceImpl implements CockpitService { if (null == out) { out = new InOutKilnVo(); } - out.setStat("1"); + out.setStat("2"); out.setPointName("出窑输送线"); out.setWorkTime("3.5"); out.setMaterialNum("25000"); 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 209f057..b2cac94 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 @@ -8,7 +8,7 @@ SUM(w.unqualified_qty) AS unqualifiedQty FROM pdm_bd_workorder w WHERE w.region_code = 'YZ' - AND DATE ( w.produce_date ) = CURDATE() + AND workorder_status='3' @@ -128,7 +128,7 @@ FROM pdm_bd_workorder w LEFT JOIN md_base_material m ON m.material_id = w.material_id WHERE w.region_code = 'HN' - and DATE ( w.produce_date ) = CURDATE() + AND w.workorder_status='3' GROUP BY m.material_name order by m.material_name @@ -141,7 +141,7 @@ FROM pdm_bd_workorder w LEFT JOIN md_base_material m ON w.material_id = m.material_id WHERE w.region_code = 'YZ' - AND w.produce_date = DATE_FORMAT(CURRENT_DATE (), '%Y%m%d') + AND w.workorder_status='3' group by m.material_name order by m.material_name @@ -152,7 +152,6 @@ SUM(qualified_qty) AS suppressedNum FROM pdm_bd_workorder WHERE region_code = 'YZ' - AND produce_date >= CURDATE() - INTERVAL 7 DAY GROUP BY produceDate ORDER BY @@ -260,7 +259,7 @@ SELECT r.device_code as deviceCode, r.error as errorInfo, r.record_time as errorTime, - p.point_name as deviceName + if(LENGTH(p.point_name) ]]> 0, p.point_name, r.device_code) as deviceName FROM `das_device_error_record` r LEFT JOIN sch_base_point p ON r.device_code = p.point_code ORDER BY r.record_time desc limit 100 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml index 68c41d2..5ac1802 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml @@ -3,8 +3,8 @@