diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml index 8c3b913..b5ef5d5 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml @@ -156,7 +156,7 @@ FROM base_device_param_val WHERE param_name IN ('机台状态-三色灯机器运行', '机台状态-三色灯机器暂停', '机台状态-三色灯机器待机', '机台状态-三色灯机器报警') AND UPPER(param_value) = 'TRUE' - AND collect_time >= TRUNC(SYSDATE) AND collect_time < TRUNC(SYSDATE) + 1 + AND collect_time >= SYSDATE - (2/24) AND collect_time < SYSDATE ), device_status AS ( SELECT device_code, param_name FROM today_latest WHERE rn = 1 diff --git a/aucma-dms/DMS_SEQUENCES.sql b/aucma-dms/DMS_SEQUENCES.sql index 5375522..616b048 100644 --- a/aucma-dms/DMS_SEQUENCES.sql +++ b/aucma-dms/DMS_SEQUENCES.sql @@ -72,6 +72,23 @@ CREATE SEQUENCE "HAIWEI"."SEQ_DMS_INSPECT_RTE_DTL" INCREMENT BY 1 CACHE 20; +-- ---------------------------- +-- 4A. SEQ_DMS_INSPECT_INSTANCE_DETAIL (巡检工单明细) +-- 表: DMS_INSPECT_INSTANCE_DETAIL +-- ---------------------------- +BEGIN + EXECUTE IMMEDIATE 'DROP SEQUENCE "HAIWEI"."SEQ_DMS_INSPECT_INSTANCE_DETAIL"'; +EXCEPTION + WHEN OTHERS THEN NULL; +END; +/ +CREATE SEQUENCE "HAIWEI"."SEQ_DMS_INSPECT_INSTANCE_DETAIL" + MINVALUE 1 + MAXVALUE 9999999999999999999999999999 + START WITH 1 + INCREMENT BY 1 + CACHE 20; + -- ---------------------------- -- 5. SEQ_DMS_LUBE_STD (润滑标准) -- 表: DMS_BASE_LUBE_STANDARD @@ -573,6 +590,8 @@ BEGIN sync_seq('HAIWEI.SEQ_DMS_INSPECT_STD', 'HAIWEI.DMS_BASE_INSPECT_STANDARD', 'INSPECT_STANDARD_ID'); -- 4. 点检路线明细 sync_seq('HAIWEI.SEQ_DMS_INSPECT_RTE_DTL', 'HAIWEI.DMS_INSPECT_ROUTE_DETAIL', 'ROUTE_DETAIL_ID'); + -- 4A. 巡检工单明细 + sync_seq('HAIWEI.SEQ_DMS_INSPECT_INSTANCE_DETAIL','HAIWEI.DMS_INSPECT_INSTANCE_DETAIL', 'INSTANCE_DETAIL_ID'); -- 5. 润滑标准 sync_seq('HAIWEI.SEQ_DMS_LUBE_STD', 'HAIWEI.DMS_BASE_LUBE_STANDARD', 'LUBE_STANDARD_ID'); -- 6. 润滑部位 @@ -631,6 +650,7 @@ BEGIN grant_and_synonym('SEQ_DMS_INSPECT_ROUTE'); grant_and_synonym('SEQ_DMS_INSPECT_STD'); grant_and_synonym('SEQ_DMS_INSPECT_RTE_DTL'); + grant_and_synonym('SEQ_DMS_INSPECT_INSTANCE_DETAIL'); grant_and_synonym('SEQ_DMS_LUBE_STD'); grant_and_synonym('SEQ_DMS_LUBE_STATION'); grant_and_synonym('SEQ_DMS_MAINT_PROJ'); diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml index 8ba62b3..4e4563f 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml @@ -16,7 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -100,7 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" real_end_time, maint_status, maint_comp_rate, - is_flag, remark, create_by, create_time, @@ -119,7 +117,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{realEndTime}, #{maintStatus}, #{maintCompRate}, - #{isFlag}, #{remark}, #{createBy}, #{createTime}, @@ -141,7 +138,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" real_end_time = #{realEndTime}, maint_status = #{maintStatus}, maint_comp_rate = #{maintCompRate}, - is_flag = #{isFlag}, remark = #{remark}, create_by = #{createBy}, create_time = #{createTime}, diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml index 2962b59..2667663 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml @@ -45,9 +45,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where instance_detail_id = #{instanceDetailId} - + + + SELECT HAIWEI.SEQ_DMS_INSPECT_INSTANCE_DETAIL.NEXTVAL FROM DUAL + insert into dms_inspect_instance_detail + instance_detail_id, inspect_instance_id, line_step, real_line_step, @@ -62,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, + #{instanceDetailId}, #{inspectInstanceId}, #{lineStep}, #{realLineStep},