diff --git a/blade-biz-common/src/main/java/org/springblade/common/annotations/Master.java b/blade-biz-common/src/main/java/org/springblade/common/annotations/Master.java new file mode 100644 index 000000000..e2083bbba --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/annotations/Master.java @@ -0,0 +1,7 @@ +package org.springblade.common.annotations; +import java.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface Master { +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/config/MyBatisConfig.java b/blade-service/logpm-report/src/main/java/com/logpm/report/config/MyBatisConfig.java new file mode 100644 index 000000000..26b7f8751 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/config/MyBatisConfig.java @@ -0,0 +1,11 @@ +package com.logpm.report.config; + +//@Configuration +public class MyBatisConfig { + +// @Bean +// public MasterCommentInterceptor masterCommentInterceptor() { +// return new MasterCommentInterceptor(); +// } + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java b/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java index 1b22c3edc..53c8a37e5 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java @@ -2,10 +2,19 @@ package com.logpm.report.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; +import com.logpm.report.interceptor.MasterCommentInterceptor; import org.mybatis.spring.annotation.MapperScan; +import org.springblade.core.mp.intercept.QueryInterceptor; +import org.springblade.core.mp.plugins.BladePaginationInterceptor; +import org.springblade.core.mp.props.MybatisPlusProperties; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.core.annotation.AnnotationAwareOrderComparator; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * @author zhaoqiaobo @@ -13,12 +22,59 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @MapperScan("com.baomidou.cloud.service.*.mapper*r") -public class MybatisPlusConfig { +public class MybatisPlusConfig implements WebMvcConfigurer { +// @Bean +// public MybatisPlusInterceptor mybatisPlusInterceptor(){ +// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); +// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); +// return interceptor; +// } + + +// @Bean +// public MasterCommentInterceptor masterCommentInterceptor() { +// return new MasterCommentInterceptor(); +// } + + + /** + * mybatis-plus 拦截器集合 + */ @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor(){ +// @ConditionalOnMissingBean(MybatisPlusInterceptor.class) + @Primary + public MybatisPlusInterceptor mybatisPlusInterceptor(ObjectProvider queryInterceptors, + TenantLineInnerInterceptor tenantLineInnerInterceptor, + MybatisPlusProperties mybatisPlusProperties) { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + + + + // 配置租户拦截器 + if (mybatisPlusProperties.getTenantMode()) { + interceptor.addInnerInterceptor(tenantLineInnerInterceptor); + } + // 配置分页拦截器 + BladePaginationInterceptor paginationInterceptor = new BladePaginationInterceptor(); + // 配置自定义查询拦截器 + QueryInterceptor[] queryInterceptorArray = queryInterceptors.getIfAvailable(); + if (ObjectUtil.isNotEmpty(queryInterceptorArray)) { + AnnotationAwareOrderComparator.sort(queryInterceptorArray); + paginationInterceptor.setQueryInterceptors(queryInterceptorArray); + } + paginationInterceptor.setMaxLimit(mybatisPlusProperties.getPageLimit()); + paginationInterceptor.setOverflow(mybatisPlusProperties.getOverflow()); + paginationInterceptor.setOptimizeJoin(mybatisPlusProperties.getOptimizeJoin()); + paginationInterceptor.setDbType(DbType.MYSQL); + interceptor.addInnerInterceptor(paginationInterceptor); + + // 添加性能分析插件（开发环境使用，生产环境移除） +// interceptor.addInnerInterceptor(new PerformanceInterceptor()); + + //拼接sql头拦截器 + interceptor.addInnerInterceptor(new MasterCommentInterceptor()); + return interceptor; } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/AllTrunklineTimeDetailDTO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/AllTrunklineTimeDetailDTO.java index 6cafeaa2e..58016fde6 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/AllTrunklineTimeDetailDTO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/AllTrunklineTimeDetailDTO.java @@ -47,7 +47,7 @@ public class AllTrunklineTimeDetailDTO implements Serializable { private String serviceNum; private String trainNumber; - private Integer isDesIncomging; + private Integer isDesIncoming; private Integer isOverTime; // 未超时 0 超时1 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportIncomingDTO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportIncomingDTO.java index 9585cc1d8..4aa63528a 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportIncomingDTO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportIncomingDTO.java @@ -28,5 +28,6 @@ public class ReportIncomingDTO implements Serializable { private List brands; private String consignee; + private Integer type; } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportStartTimeDetailDTO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportStartTimeDetailDTO.java index dc5da508a..8860d3843 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportStartTimeDetailDTO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportStartTimeDetailDTO.java @@ -41,7 +41,7 @@ public class ReportStartTimeDetailDTO implements Serializable { private String serviceNum; private String trainNumber; - private Integer isDesIncomging; + private Integer isStarting; private Integer isOverTime; // 未超时 0 超时1 //开单件数 1 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/MasterCommentInterceptor.java b/blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/MasterCommentInterceptor.java new file mode 100644 index 000000000..783a2abb7 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/MasterCommentInterceptor.java @@ -0,0 +1,67 @@ +package com.logpm.report.interceptor; + +import com.baomidou.mybatisplus.core.toolkit.PluginUtils; +import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.executor.statement.StatementHandler; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.SqlCommandType; +import org.apache.ibatis.plugin.Intercepts; +import org.apache.ibatis.plugin.Signature; +import org.springblade.common.annotations.Master; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.sql.Connection; + + +@Intercepts({ + @Signature( + type = StatementHandler.class, + method = "prepare", + args = {Connection.class, Integer.class} + ) +}) +@Slf4j +public class MasterCommentInterceptor implements InnerInterceptor { + + @Override + public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) { + PluginUtils.MPStatementHandler handler = PluginUtils.mpStatementHandler(sh); + MappedStatement ms = handler.mappedStatement(); + SqlCommandType sct = ms.getSqlCommandType(); + Method method = getMethodFromMappedStatement(ms); + if (method != null && method.isAnnotationPresent(Master.class)) { + BoundSql boundSql = handler.boundSql(); + String sql = boundSql.getSql(); + sql = "/*MASTER*/ " + sql; + try { + Field field = boundSql.getClass().getDeclaredField("sql"); + field.setAccessible(true); + field.set(boundSql, sql); + } catch (NoSuchFieldException e) { + log.error("NoSuchFieldException：", e); + } catch (IllegalAccessException e) { + log.error("IllegalAccessException：", e); + } + } + } + + private Method getMethodFromMappedStatement(MappedStatement ms) { + try { + String methodName = ms.getId().substring(ms.getId().lastIndexOf(".") + 1); + Class mapperClass = Class.forName(ms.getId().substring(0, ms.getId().lastIndexOf("."))); + for (Method method : mapperClass.getMethods()) { + if (method.getName().equals(methodName)) { + return method; + } + } + } catch (ClassNotFoundException e) { + // 忽略异常 + } + return null; + } + + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.java index fcddcc511..31e1b75b0 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.java @@ -6,6 +6,7 @@ import com.logpm.report.dto.ReportIncomingDetailDTO; import com.logpm.report.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.springblade.common.annotations.Master; import java.util.List; @@ -13,6 +14,7 @@ import java.util.List; public interface ReportIncomingMapper { + @Master IPage deptIncomingPage(IPage page, @Param("param") ReportIncomingDTO reportIncomingDTO); List findIncomingNum( @Param("param") ReportIncomingDTO reportIncomingDTO); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml index 6e9016d7c..a00d7a10b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml @@ -99,8 +99,15 @@ '全部' brand, - YEAR(lww.document_making_time) nian, - MONTH(lww.document_making_time) yue, + + YEAR(lww.document_making_time) timeStr, + + + CONCAT(YEAR(lww.document_making_time),'-',QUARTER(lww.document_making_time)) timeStr, + + + CONCAT(YEAR(lww.document_making_time),'-',MONTH(lww.document_making_time)) timeStr, + count(lww.id) waybillNum, sum(lww.total_count) num, sum(IFNULL(lww.total_weight,0)) weight, @@ -149,22 +156,34 @@ and lww.document_making_time <= #{param.endTime} - group by YEAR(lww.document_making_time), - - waw.business_line, - - - lww.departure_warehouse_id, - lww.departure_warehouse_name, - - - lww.destination_warehouse_id, - lww.destination_warehouse_name, - - - lww.brand, - - MONTH(lww.document_making_time) + group by + + + YEAR(lww.document_making_time), + + + YEAR(lww.document_making_time), + QUARTER(lww.document_making_time), + + + YEAR(lww.document_making_time), + MONTH(lww.document_making_time), + + + waw.business_line, + + + lww.departure_warehouse_id, + lww.departure_warehouse_name, + + + lww.destination_warehouse_id, + lww.destination_warehouse_name, + + + lww.brand, + + @@ -251,8 +270,15 @@ '全部' brand, - YEAR(lww.document_making_time) nian, - MONTH(lww.document_making_time) yue, + + YEAR(lww.document_making_time) timeStr, + + + CONCAT(YEAR(lww.document_making_time),'-',QUARTER(lww.document_making_time)) timeStr, + + + CONCAT(YEAR(lww.document_making_time),'-',MONTH(lww.document_making_time)) timeStr, + case when lww.waybill_type = '1' then count(ldpl.id) when lww.waybill_type = '2' then sum(ldpn.quantity) end stockNum, case when lww.waybill_type = '1' then sum(IF(ldpl.order_package_status='70',1,0)) @@ -293,20 +319,32 @@ and lww.document_making_time <= #{param.endTime} - group by YEAR(lww.document_making_time), - - waw.business_line, - - - lww.departure_warehouse_name, - - - lww.destination_warehouse_name, - - - lww.brand, - - MONTH(lww.document_making_time) + group by + + + YEAR(lww.document_making_time), + + + YEAR(lww.document_making_time), + QUARTER(lww.document_making_time), + + + YEAR(lww.document_making_time), + MONTH(lww.document_making_time), + + + waw.business_line, + + + lww.departure_warehouse_name, + + + lww.destination_warehouse_name, + + + lww.brand, + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportQuallityMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportQuallityMapper.xml index 9dce52b9a..5766a2110 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportQuallityMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportQuallityMapper.xml @@ -157,6 +157,12 @@ and lww.departure_warehouse_id = #{param.departureWarehouseId} and lww.destination_warehouse_id = #{param.destinationWarehouseId} and lww.brand = #{param.brand} + + and lww.create_time >= #{param.startTime} + + + and lww.create_time <= #{param.endTime} + and ltwt.refer = '发车前修改' @@ -188,8 +194,21 @@ lww.destination_warehouse_id destinationWarehouseId, lww.destination_warehouse_name destinationWarehouseName, lww.brand brand, - lww.waybill_status waybillStatus, + case when lww.waybill_status='10' then '部分入库' + when lww.waybill_status='20' then '入库' + when lww.waybill_status='30' then '部分中转' + when lww.waybill_status='40' then '中转' + when lww.waybill_status='50' then '目的仓部分到达' + when lww.waybill_status='60' then '目的仓到达' + when lww.waybill_status='70' then '配送部分装车' + when lww.waybill_status='80' then '配送装车' + when lww.waybill_status='90' then '部分签收' + when lww.waybill_status='100' then '已签收' + else '未知' end waybillStatus, lww.waybill_type waybillType, + CASE WHEN lww.waybill_type=1 THEN '订制品' + WHEN lww.waybill_type=2 THEN '零担' + ELSE '未知' END waybillType, lww.agent agent, lww.create_time createTime, ltwt.create_time applyTime, @@ -208,6 +227,12 @@ and lww.departure_warehouse_id = #{param.departureWarehouseId} and lww.destination_warehouse_id = #{param.destinationWarehouseId} and lww.brand = #{param.brand} + + and lww.create_time >= #{param.startTime} + + + and lww.create_time <= #{param.endTime} + and ltwt.refer = '发车前修改' diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index af2e2f0db..29b791686 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -569,7 +569,7 @@ sum(ldpl.quantity) incomingNum, count(ltcls.id) outNum, sum(ldpl.quantity)-count(ltcls.id) noOutNum, - sum(if(ldpl.order_package_status='20' and now() < DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0 )) noOutOverNum, + sum(if(ldpl.order_package_status='20' and now() > DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0 )) noOutOverNum, sum(if(ltcll.start_date < DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) outOnTimeNum, IFNULL(round(sum(if(ltcll.start_date < DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(ltcls.id)*100,2),'0.00') outOnTimeRate, round(sum(TIMESTAMPDIFF(SECOND, ldpl.create_time, ltcll.start_date))/count(ltcls.id)/3600,1) avgTime @@ -638,7 +638,7 @@ sum(ldpl.quantity) incomingNum, count(ltcls.id) outNum, sum(ldpl.quantity)-count(ltcls.id) noOutNum, - sum(if(ldpl.order_package_status='20' and now() < DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0 )) noOutOverNum, + sum(if(ldpl.order_package_status='20' and now() > DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0 )) noOutOverNum, sum(if(ltcll.start_date <= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) outOnTimeNum, IFNULL(concat(round(sum(if(ltcll.start_date <= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(ltcls.id)*100,2),'%'),'0.00%') outOnTimeRate, round(sum(TIMESTAMPDIFF(SECOND, ldpl.create_time, ltcll.start_date))/count(ltcls.id)/3600,1) avgTime @@ -2547,8 +2547,8 @@ ldpl.create_time desIncomgingTime, round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1) incomingHours, IFNULL(lrat.hours_time,#{param.hoursTime}) hoursTime, - case when round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) then '0' - when round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) then '1' + case when round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) then '0' + when round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) then '1' else '未知' end isOverTime from logpm_trunkline_advance_detail ltad left join logpm_trunkline_advance lta on lta.id = ltad.advance_id @@ -2589,14 +2589,14 @@ and ltad.train_number like concat('%',#{param.trainNumber},'%') - - and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncomging} + + and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncoming} - and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) + and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) - and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) + and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) and ldpl.id IS NOT NULL @@ -2606,7 +2606,7 @@ and ldpl.id IS NOT NULL - and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) + and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) @@ -2639,8 +2639,8 @@ ldpl.create_time desIncomgingTime, round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1) incomingHours, IFNULL(lrat.hours_time,#{param.hoursTime}) hoursTime, - case when round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) then '未超时' - when round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) then '超时' + case when round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) then '未超时' + when round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) then '超时' else '未知' end isOverTime from logpm_trunkline_advance_detail ltad left join logpm_trunkline_advance lta on lta.id = ltad.advance_id @@ -2681,14 +2681,14 @@ and ltad.train_number like concat('%',#{param.trainNumber},'%') - - and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncomging} + + and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncoming} - and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) + and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) - and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) + and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) and ldpl.id IS NOT NULL @@ -2698,7 +2698,7 @@ and ldpl.id IS NOT NULL - and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) + and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)<=IFNULL(lrat.hours_time,#{param.hoursTime}) @@ -2776,8 +2776,8 @@ and ltad.train_number like concat('%',#{param.trainNumber},'%') - - and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging} + + and if(ltcll.start_date is null,0,1) = #{param.isStarting} and round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)<=#{param.hoursTime} @@ -2876,8 +2876,8 @@ and ltad.train_number like concat('%',#{param.trainNumber},'%') - - and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging} + + and if(ltcll.start_date is null,0,1) = #{param.isStarting} and round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)<=#{param.hoursTime} @@ -2929,9 +2929,9 @@ if(ltcll.start_date is null,0,1) isStarting, ltcll.start_date startTime, round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1) startHours, - 72 hoursTime, - case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)<=72 then '未超时' - when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>72 then '超时' + #{param.hoursTime} hoursTime, + case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)<=#{param.hoursTime} then '0' + when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>#{param.hoursTime} then '1' else '未知' end isOverTime from logpm_distribution_parcel_list ldpl left join logpm_trunkline_advance lta on lta.id = ldpl.advance_id @@ -2976,8 +2976,8 @@ and ldpl.train_number like concat('%',#{param.trainNumber},'%') - - and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging} + + and if(ltcll.start_date is null,0,1) = #{param.isStarting} and round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)<=#{param.hoursTime} @@ -2993,7 +2993,7 @@ and ltcls.id is null - and now() <= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ) + and now() >= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ) @@ -3027,9 +3027,9 @@ if(ltcll.start_date is null,0,1) isStarting, ltcll.start_date startTime, round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1) startHours, - 72 hoursTime, - case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)<=72 then '未超时' - when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>72 then '超时' + #{param.hoursTime} hoursTime, + case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)<=#{param.hoursTime} then '未超时' + when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)>#{param.hoursTime} then '超时' else '未知' end isOverTime from logpm_distribution_parcel_list ldpl left join logpm_trunkline_advance lta on lta.id = ldpl.advance_id @@ -3074,8 +3074,8 @@ and ldpl.train_number like concat('%',#{param.trainNumber},'%') - - and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging} + + and if(ltcll.start_date is null,0,1) = #{param.isStarting} and round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)<=#{param.hoursTime} @@ -3091,7 +3091,7 @@ and ltcls.id is null - and now() <= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ) + and now() >= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR ) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportIncomingServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportIncomingServiceImpl.java index 6d85588f0..475019176 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportIncomingServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportIncomingServiceImpl.java @@ -515,79 +515,11 @@ public class ReportIncomingServiceImpl implements IReportIncomingService { page.setCurrent(reportIncomingDTO.getPageNum()); page.setSize(reportIncomingDTO.getPageSize()); - String year = reportIncomingDTO.getYear(); - String month = reportIncomingDTO.getMonth(); String startTimeStr = reportIncomingDTO.getStartTimeStr(); String endTimeStr = reportIncomingDTO.getEndTimeStr(); - String timeStr = null; - if(StringUtil.isNotBlank(startTimeStr) && StringUtil.isNotBlank(endTimeStr)){ - reportIncomingDTO.setStartTime(CommonUtil.getStartByDateStr(startTimeStr)); - reportIncomingDTO.setEndTime(CommonUtil.getEndByDateStr(endTimeStr)); - timeStr=startTimeStr+"至"+endTimeStr; - }else{ - if(StringUtil.isNotBlank(month)){ - Calendar instance = Calendar.getInstance(); - if(StringUtil.isBlank(year)){ - log.info("############deptIncomingPage：请选择年份"); - return R.fail(405,"请选择年份"); - } - try{ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); - SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - final Date parse = sdf.parse(year+"-"+month); - reportIncomingDTO.setStartTime(CommonUtil.StringToDate(sdf1.format(parse))); - final Calendar cal = Calendar.getInstance(); - cal.setTime(parse); - final int last = cal.getActualMaximum(Calendar.DAY_OF_MONTH); - cal.set(Calendar.DAY_OF_MONTH, last); - cal.add(Calendar.DATE, +1); - cal.add(Calendar.SECOND, -1); - reportIncomingDTO.setEndTime(cal.getTime()); - - timeStr = year+"年"+month+"月"; - - }catch (Exception e){ - log.info("############deptIncomingPage："); - return R.fail(405,"请选择年份"); - } - }else{ - if(StringUtil.isNotBlank(year)){ - Calendar instance = Calendar.getInstance(); - instance.set(Calendar.YEAR,Integer.parseInt(year)); - instance.set(Calendar.MONTH,Calendar.JANUARY); - instance.set(Calendar.DAY_OF_MONTH,1); - instance.set(Calendar.HOUR_OF_DAY, 0); - instance.set(Calendar.MINUTE, 0); - instance.set(Calendar.SECOND, 0); - instance.set(Calendar.MILLISECOND, 0); - reportIncomingDTO.setStartTime(instance.getTime()); - instance.set(Calendar.MONTH,Calendar.DECEMBER); - instance.set(Calendar.DAY_OF_MONTH,31); - instance.set(Calendar.HOUR_OF_DAY, 23); - instance.set(Calendar.MINUTE, 59); - instance.set(Calendar.SECOND, 59); - instance.set(Calendar.MILLISECOND, 999); - reportIncomingDTO.setEndTime(instance.getTime()); - timeStr = year+"年"; - }else{ - Calendar instance = Calendar.getInstance(); - instance.set(Calendar.HOUR_OF_DAY, 23); - instance.set(Calendar.MINUTE, 59); - instance.set(Calendar.SECOND, 59); - instance.set(Calendar.MILLISECOND, 999); - reportIncomingDTO.setEndTime(instance.getTime()); - instance.add(Calendar.DATE, -7); - instance.set(Calendar.HOUR_OF_DAY, 0); - instance.set(Calendar.MINUTE, 0); - instance.set(Calendar.SECOND, 0); - instance.set(Calendar.MILLISECOND, 0); - reportIncomingDTO.setStartTime(instance.getTime()); - timeStr=CommonUtil.dateToStringGeneral(reportIncomingDTO.getStartTime())+"至"+CommonUtil.dateToStringGeneral(reportIncomingDTO.getEndTime()); - } - } - } + reportIncomingDTO.setStartTime(CommonUtil.getStartByDateStr(startTimeStr)); + reportIncomingDTO.setEndTime(CommonUtil.getEndByDateStr(endTimeStr)); IPage iPage = reportIncomingMapper.deptIncomingPageNew(page,reportIncomingDTO); @@ -598,7 +530,7 @@ public class ReportIncomingServiceImpl implements IReportIncomingService { .collect(Collectors.toMap(t-> t.getBusinessLine()+"&&"+t.getBrand()+"&&"+t.getDepartureWarehouseName()+"&&"+t.getDestinationWarehouseName()+"&&"+t.getNian()+"&&"+t.getYue(), reportDeptIncomingNumVO -> reportDeptIncomingNumVO)); List records = iPage.getRecords(); - String finalTimeStr = timeStr; +// String finalTimeStr = timeStr; records.forEach(reportDeptIncomingVO -> { String businessLine = reportDeptIncomingVO.getBusinessLine(); String brand = reportDeptIncomingVO.getBrand(); @@ -606,7 +538,7 @@ public class ReportIncomingServiceImpl implements IReportIncomingService { String destinationWarehouseName = reportDeptIncomingVO.getDestinationWarehouseName(); String nian = reportDeptIncomingVO.getNian(); String yue = reportDeptIncomingVO.getYue(); - reportDeptIncomingVO.setTimeStr(finalTimeStr); +// reportDeptIncomingVO.setTimeStr(finalTimeStr); ReportDeptIncomingNumVO reportDeptIncomingNumVO = map.get(businessLine + "&&" + brand + "&&" + departureWarehouseName + "&&" + destinationWarehouseName+"&&"+nian+"&&"+yue); if(!Objects.isNull(reportDeptIncomingNumVO)){ reportDeptIncomingVO.setStockNum(reportDeptIncomingNumVO.getStockNum()); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index a0b330f74..23f7abe63 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -188,6 +188,9 @@ and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0 + + and ltcl.load_status = #{param.loadStatus} + and ltcl.create_time >= #{param.createTimeStart} @@ -518,6 +521,7 @@ ltcl.is_settlement isSettlement, ltcl.customer_type customerType, ltcl.start_time startTime, + ltcl.arrive_time arriveTime, ltcl.plan_loading_number planLoadingNumber, ltcl.real_loading_number realLoadingNumber, ltcl.unload_number unloadNumber, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index c1dca9926..490792a86 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -3061,9 +3061,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String warehouseName = openOrderDTO.getWarehouseName(); String editReson = openOrderDTO.getEditReson(); String refer = openOrderDTO.getRefer(); - if(StringUtil.isBlank(refer)){ - refer = " "; - } List updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); @@ -3149,9 +3146,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailService.updateBatchById(updateAdvanceDetailList); } -// String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg; + String operationRemark = "备注：" + refer + " 修改内容：" + updateMsg; + if(StringUtil.isBlank(refer)){ + operationRemark = "修改内容：" + updateMsg; + } + + //异步存入日志 - openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注：" + refer + " 修改内容：" + updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, waybillEntity); + openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, operationRemark, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName, waybillEntity); // List wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 5ff7690e6..467d4f92a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -862,7 +862,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"1"); -// List scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndNoScanStatus(loadId,"3"); - List scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"2"); + return signLoadScanByIds(scanLoadIds,warehouseId); + }else if("2".equals(deliveryType)){ + List scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"2"); + + return signLoadScanByIds(scanLoadIds,warehouseId); - return signLoadScanByIds(scanLoadIds,warehouseId); + }else{ + log.warn("#############signCars: 三方中转送货方式不存在 loadId={}", loadId); + return R.fail(405,"三方中转送货方式不存在"); + } + + +// List scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndNoScanStatus(loadId,"3"); +// List scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"2"); +// +// return signLoadScanByIds(scanLoadIds,warehouseId); // carsLoadEntity.setSignTime(new Date()); // carsLoadEntity.setLoadStatus("90"); @@ -3404,6 +3427,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl page = new Page<>(); page.setCurrent(loadCarsDTO.getPageNum()); page.setSize(loadCarsDTO.getPageSize()); @@ -3439,7 +3471,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("data", pageList); + + String loadType = carsLoadEntity.getLoadType(); + String deliveryType = carsLoadEntity.getDeliveryType(); + + map.put("loadType",loadType); + map.put("deliveryType",deliveryType); + + return R.data(map); } @Override @@ -10792,9 +10834,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl !"20".equals(parcelListEntity.getOrderPackageStatus())) .collect(Collectors.toList()); + int allTotal = packageList.size(); + + if(CollUtil.isNotEmpty(noStockParcelListEntityList)){ - log.warn("##################loadingTrayPackageList: 存在不在库的包件 warehouseId={}", warehouseId); - throw new CustomerException(405, "存在不在库的包件"); + + int size = noStockParcelListEntityList.size(); + if(NumberUtil.equals(allTotal,size)){ + log.warn("##################loadingTrayPackageList: 托盘已经装车 warehouseId={}", warehouseId); + throw new CustomerException(405, "托盘已经装车"); + }else{ + log.warn("##################loadingTrayPackageList: 托盘数据异常 warehouseId={}", warehouseId); + throw new CustomerException(405, "托盘数据异常，请联系管理员"); + } + } List noPlanPackageList = new ArrayList<>(); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/MyBatisConfig.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/MyBatisConfig.java new file mode 100644 index 000000000..cc8b28d8b --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/MyBatisConfig.java @@ -0,0 +1,12 @@ +package com.logpm.warehouse.config; + +import com.logpm.warehouse.interceptor.MasterCommentInterceptor; +import org.springframework.context.annotation.Bean; + +//@Configuration +public class MyBatisConfig { + @Bean + public MasterCommentInterceptor masterCommentInterceptor() { + return new MasterCommentInterceptor(); + } +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/interceptor/MasterCommentInterceptor.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/interceptor/MasterCommentInterceptor.java new file mode 100644 index 000000000..94afbf7e8 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/interceptor/MasterCommentInterceptor.java @@ -0,0 +1,100 @@ +package com.logpm.warehouse.interceptor; + +import org.apache.ibatis.executor.Executor; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.plugin.*; +import org.apache.ibatis.session.ResultHandler; +import org.apache.ibatis.session.RowBounds; +import org.springblade.common.annotations.Master; + +import java.lang.reflect.Method; +import java.util.Properties; + +@Intercepts({ + @Signature( + type = Executor.class, + method = "query", + args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class} + ) +}) +public class MasterCommentInterceptor implements Interceptor { + + @Override + public Object intercept(Invocation invocation) throws Throwable { + // 获取当前执行的 MappedStatement + MappedStatement ms = (MappedStatement) invocation.getArgs()[0]; + + // 检查方法是否标记了 @Master 注解 + Method method = getMethodFromMappedStatement(ms); + if (method != null && method.isAnnotationPresent(Master.class)) { + // 获取原始 SQL + BoundSql boundSql = ms.getBoundSql(invocation.getArgs()[1]); + String originalSql = boundSql.getSql(); + + // 添加 /*master*/ 注释 + String newSql = "/*FORCE_MASTER*/ " + originalSql; + + // 创建新的 BoundSql 和 MappedStatement + BoundSql newBoundSql = new BoundSql( + ms.getConfiguration(), + newSql, + boundSql.getParameterMappings(), + boundSql.getParameterObject() + ); + MappedStatement newMs = rebuildMappedStatement(ms, newBoundSql); + + // 替换原参数中的 MappedStatement + invocation.getArgs()[0] = newMs; + } + return invocation.proceed(); + } + + // 根据 MappedStatement 获取对应的 Method + private Method getMethodFromMappedStatement(MappedStatement ms) { + try { + String methodName = ms.getId().substring(ms.getId().lastIndexOf(".") + 1); + Class mapperClass = Class.forName(ms.getId().substring(0, ms.getId().lastIndexOf("."))); + for (Method method : mapperClass.getMethods()) { + if (method.getName().equals(methodName)) { + return method; + } + } + } catch (ClassNotFoundException e) { + // 忽略异常 + } + return null; + } + + // 重建 MappedStatement（避免缓存污染） + private MappedStatement rebuildMappedStatement(MappedStatement ms, BoundSql newBoundSql) { + MappedStatement.Builder builder = new MappedStatement.Builder( + ms.getConfiguration(), + ms.getId() + "-master", + ms.getSqlSource(), + ms.getSqlCommandType() + ); + builder.resource(ms.getResource()) + .fetchSize(ms.getFetchSize()) + .statementType(ms.getStatementType()) + .keyGenerator(ms.getKeyGenerator()) + .keyProperty(String.join(",", ms.getKeyProperties())) + .timeout(ms.getTimeout()) + .parameterMap(ms.getParameterMap()) + .resultMaps(ms.getResultMaps()) + .resultSetType(ms.getResultSetType()) + .cache(ms.getCache()) + .flushCacheRequired(ms.isFlushCacheRequired()) + .useCache(ms.isUseCache()) + .databaseId(ms.getDatabaseId()); + return builder.build(); + } + + @Override + public Object plugin(Object target) { + return Plugin.wrap(target, this); + } + + @Override + public void setProperties(Properties properties) {} +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index b30f75827..b4596610f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -495,8 +495,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodes) { @@ -508,15 +511,21 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl