1.干线bug修复

2.报表明细bug修复

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 {
+}

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();
+//	}
+
+}

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<QueryInterceptor[]> 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;
 	}
 

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
 
 

blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportIncomingDTO.java

@@ -28,5 +28,6 @@ public class ReportIncomingDTO implements Serializable {
 	private List<String> brands;
 	private String consignee;
 
+	private Integer type;
 
 }

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

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;
+	}
+
+
+}

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<ReportDeptIncomingVO> deptIncomingPage(IPage<Object> page, @Param("param") ReportIncomingDTO reportIncomingDTO);
 
 	List<ReportDeptIncomingNumVO> findIncomingNum( @Param("param") ReportIncomingDTO reportIncomingDTO);

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml

@@ -99,8 +99,15 @@
         <if test="param.brands == null or param.brands.size() == 0 ">
             '全部' brand,
         </if>
-        YEAR(lww.document_making_time) nian,
+        <if test="param.type != null and param.type == 1">
-        MONTH(lww.document_making_time) yue,
+            YEAR(lww.document_making_time) timeStr,
+        </if>
+        <if test="param.type != null and param.type == 2">
+            CONCAT(YEAR(lww.document_making_time),'-',QUARTER(lww.document_making_time)) timeStr,
+        </if>
+        <if test="param.type != null and param.type == 3">
+            CONCAT(YEAR(lww.document_making_time),'-',MONTH(lww.document_making_time)) timeStr,
+        </if>
         count(lww.id) waybillNum,
         sum(lww.total_count) num,
         sum(IFNULL(lww.total_weight,0)) weight,
@@ -149,22 +156,34 @@
         <if test="param.endTime != null ">
             and lww.document_making_time &lt;= #{param.endTime}
         </if>
-        group by YEAR(lww.document_making_time),
+        group by
-        <if test="param.businessLines != null and param.businessLines.size() > 0 ">
+        <trim suffixOverrides=",">
-            waw.business_line,
+            <if test="param.type != null and param.type == 1">
-        </if>
+                YEAR(lww.document_making_time),
-        <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
+            </if>
-            lww.departure_warehouse_id,
+            <if test="param.type != null and param.type == 2">
-            lww.departure_warehouse_name,
+                YEAR(lww.document_making_time),
-        </if>
+                QUARTER(lww.document_making_time),
-        <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
+            </if>
-            lww.destination_warehouse_id,
+            <if test="param.type != null and param.type == 3">
-            lww.destination_warehouse_name,
+                YEAR(lww.document_making_time),
-        </if>
+                MONTH(lww.document_making_time),
-        <if test="param.brands != null and param.brands.size() > 0 ">
+            </if>
-            lww.brand,
+            <if test="param.businessLines != null and param.businessLines.size() > 0 ">
-        </if>
+                waw.business_line,
-        MONTH(lww.document_making_time)
+            </if>
+            <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
+                lww.departure_warehouse_id,
+                lww.departure_warehouse_name,
+            </if>
+            <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
+                lww.destination_warehouse_id,
+                lww.destination_warehouse_name,
+            </if>
+            <if test="param.brands != null and param.brands.size() > 0 ">
+                lww.brand,
+            </if>
+        </trim>
     </select>
 
 
@@ -251,8 +270,15 @@
         <if test="param.brands == null or param.brands.size() == 0 ">
             '全部' brand,
         </if>
-        YEAR(lww.document_making_time) nian,
+        <if test="param.type != null and param.type == 1">
-        MONTH(lww.document_making_time) yue,
+            YEAR(lww.document_making_time) timeStr,
+        </if>
+        <if test="param.type != null and param.type == 2">
+            CONCAT(YEAR(lww.document_making_time),'-',QUARTER(lww.document_making_time)) timeStr,
+        </if>
+        <if test="param.type != null and param.type == 3">
+            CONCAT(YEAR(lww.document_making_time),'-',MONTH(lww.document_making_time)) timeStr,
+        </if>
         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 @@
         <if test="param.endTime != null ">
             and lww.document_making_time &lt;= #{param.endTime}
         </if>
-        group by YEAR(lww.document_making_time),
+        group by
-        <if test="param.businessLines != null and param.businessLines.size() > 0 ">
+        <trim suffixOverrides=",">
-            waw.business_line,
+            <if test="param.type != null and param.type == 1">
-        </if>
+                YEAR(lww.document_making_time),
-        <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
+            </if>
-            lww.departure_warehouse_name,
+            <if test="param.type != null and param.type == 2">
-        </if>
+                YEAR(lww.document_making_time),
-        <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
+                QUARTER(lww.document_making_time),
-            lww.destination_warehouse_name,
+            </if>
-        </if>
+            <if test="param.type != null and param.type == 3">
-        <if test="param.brands != null and param.brands.size() > 0 ">
+                YEAR(lww.document_making_time),
-            lww.brand,
+                MONTH(lww.document_making_time),
-        </if>
+            </if>
-        MONTH(lww.document_making_time)
+            <if test="param.businessLines != null and param.businessLines.size() > 0 ">
+                waw.business_line,
+            </if>
+            <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
+                lww.departure_warehouse_name,
+            </if>
+            <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
+                lww.destination_warehouse_name,
+            </if>
+            <if test="param.brands != null and param.brands.size() > 0 ">
+                lww.brand,
+            </if>
+        </trim>
     </select>
 
 

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}
+        <if test="param.startTime != null ">
+            and lww.create_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null ">
+            and lww.create_time &lt;= #{param.endTime}
+        </if>
         <if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 3">
             and ltwt.refer = '发车前修改'
         </if>
@@ -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}
+        <if test="param.startTime != null ">
+            and lww.create_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null ">
+            and lww.create_time &lt;= #{param.endTime}
+        </if>
         <if test="param.updateWaybillDetailType != null and param.updateWaybillDetailType == 3">
             and ltwt.refer = '发车前修改'
         </if>

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'
+        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,ldpl.create_time)/3600,1)>IFNULL(lrat.hours_time,#{param.hoursTime}) then '1'
+        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 @@
         <if test="param.trainNumber != null and param.trainNumber != ''">
             and ltad.train_number like concat('%',#{param.trainNumber},'%')
         </if>
-        <if test="param.isDesIncomging != null">
+        <if test="param.isDesIncoming != null">
-            and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncomging}
+            and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncoming}
         </if>
         <if test="param.isOverTime != null and param.isOverTime ==0">
-            and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
+            and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
         </if>
         <if test="param.isOverTime != null and param.isOverTime ==1">
-            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})
         </if>
         <if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==2">
             and ldpl.id IS NOT NULL
@@ -2606,7 +2606,7 @@
         </if>
         <if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==4">
             and ldpl.id IS NOT NULL
-            and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
+            and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
         </if>
 
 
@@ -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)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime}) then '未超时'
+        case when round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)&lt;=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 '超时'
+        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 @@
         <if test="param.trainNumber != null and param.trainNumber != ''">
             and ltad.train_number like concat('%',#{param.trainNumber},'%')
         </if>
-        <if test="param.isDesIncomging != null">
+        <if test="param.isDesIncoming != null">
-            and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncomging}
+            and IF(ldpl.id IS NULL,0,1) = #{param.isDesIncoming}
         </if>
         <if test="param.isOverTime != null and param.isOverTime ==0">
-            and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
+            and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
         </if>
         <if test="param.isOverTime != null and param.isOverTime ==1">
-            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})
         </if>
         <if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==2">
             and ldpl.id IS NOT NULL
@@ -2698,7 +2698,7 @@
         </if>
         <if test="param.allTrunklineTimeDetailType != null and param.allTrunklineTimeDetailType ==4">
             and ldpl.id IS NOT NULL
-            and round(TIMESTAMPDIFF(SECOND,ltad.create_time,ldpl.create_time)/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
+            and round(TIMESTAMPDIFF(SECOND,ltad.create_time,IFNULL(ldpl.create_time,NOW()))/3600,1)&lt;=IFNULL(lrat.hours_time,#{param.hoursTime})
         </if>
     </select>
 
@@ -2776,8 +2776,8 @@
         <if test="param.trainNumber != null and param.trainNumber != ''">
             and ltad.train_number like concat('%',#{param.trainNumber},'%')
         </if>
-        <if test="param.isDesIncomging != null">
+        <if test="param.isStarting != null">
-            and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging}
+            and if(ltcll.start_date is null,0,1) = #{param.isStarting}
         </if>
         <if test="param.isOverTime != null and param.isOverTime ==0">
             and round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime}
@@ -2876,8 +2876,8 @@
         <if test="param.trainNumber != null and param.trainNumber != ''">
             and ltad.train_number like concat('%',#{param.trainNumber},'%')
         </if>
-        <if test="param.isDesIncomging != null">
+        <if test="param.isStarting != null">
-            and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging}
+            and if(ltcll.start_date is null,0,1) = #{param.isStarting}
         </if>
         <if test="param.isOverTime != null and param.isOverTime ==0">
             and round(TIMESTAMPDIFF(SECOND,ltad.incoming_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{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,
+        #{param.hoursTime} hoursTime,
-        case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=72 then '未超时'
+        case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime} then '0'
-        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)>#{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 @@
         <if test="param.trainNumber != null and param.trainNumber != ''">
             and ldpl.train_number like concat('%',#{param.trainNumber},'%')
         </if>
-        <if test="param.isDesIncomging != null">
+        <if test="param.isStarting != null">
-            and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging}
+            and if(ltcll.start_date is null,0,1) = #{param.isStarting}
         </if>
         <if test="param.isOverTime != null and param.isOverTime ==0">
             and round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime}
@@ -2993,7 +2993,7 @@
         </if>
         <if test="param.startDetailType != null and param.startDetailType ==3">
             and ltcls.id is null
-            and now() &lt;= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR )
+            and now() &gt;= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR )
         </if>
 
 
@@ -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,
+        #{param.hoursTime} hoursTime,
-        case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=72 then '未超时'
+        case when round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime} then '未超时'
-        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)>#{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 @@
         <if test="param.trainNumber != null and param.trainNumber != ''">
             and ldpl.train_number like concat('%',#{param.trainNumber},'%')
         </if>
-        <if test="param.isDesIncomging != null">
+        <if test="param.isStarting != null">
-            and if(ltcll.start_date is null,0,1) = #{param.isDesIncomging}
+            and if(ltcll.start_date is null,0,1) = #{param.isStarting}
         </if>
         <if test="param.isOverTime != null and param.isOverTime ==0">
             and round(TIMESTAMPDIFF(SECOND,ldpl.create_time,IFNULL(ltcll.start_date,NOW()))/3600,1)&lt;=#{param.hoursTime}
@@ -3091,7 +3091,7 @@
         </if>
         <if test="param.startDetailType != null and param.startDetailType ==3">
             and ltcls.id is null
-            and now() &lt;= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR )
+            and now() &gt;= DATE_ADD( ldpl.create_time, INTERVAL #{param.hoursTime} HOUR )
         </if>
     </select>
 

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);
+		reportIncomingDTO.setStartTime(CommonUtil.getStartByDateStr(startTimeStr));
-					instance.set(Calendar.DAY_OF_MONTH,31);
+		reportIncomingDTO.setEndTime(CommonUtil.getEndByDateStr(endTimeStr));
-					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());
-				}
-			}
-		}
 
 		IPage<ReportDeptIncomingVO> 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<ReportDeptIncomingVO> 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());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -188,6 +188,9 @@
         <if test="param.loadCarsNo != null and param.loadCarsNo != ''">
             and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0
         </if>
+        <if test="param.loadStatus != null and param.loadStatus != ''">
+            and ltcl.load_status = #{param.loadStatus}
+        </if>
         <if test="param.createTimeStart != null ">
             and ltcl.create_time &gt;= #{param.createTimeStart}
         </if>
@@ -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,

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<TrunklineAdvanceDetailEntity> 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<WarehouseWayBillDetail> wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo);
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -862,7 +862,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			//中间网点发车
 			trunklineCarsLoadLineService.updateStartTime(currentCarsLoadLineEntity.getId(),"10",null,null,null);
 
-			baseMapper.updateStartTime(loadId,"20",null);
+			Integer sort1 = currentCarsLoadLineEntity.getSort();
+
+			TrunklineCarsLoadLineEntity carsLoadLine = trunklineCarsLoadLineService.findEntityByLoadIdAndSort(loadId, sort1 - 1);
+
+			if(!Objects.isNull(carsLoadLine)){
+				baseMapper.updateStartTime(loadId,"20",carsLoadLine.getStartDate());
+			}
+
 //			carsLoadEntity.setLoadStatus("20");
 //			carsLoadEntity.setStartTime(null);
 //			updateById(carsLoadEntity);
@@ -3341,11 +3348,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			throw new CustomerException(400, "三方中转节点不存在");
 		}
 
+		String deliveryType = carsLoadEntity.getDeliveryType();
+
+		if("1".equals(deliveryType)){
+			List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"1");
 
-//		List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndNoScanStatus(loadId,"3");
+			return signLoadScanByIds(scanLoadIds,warehouseId);
-		List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"2");
+		}else if("2".equals(deliveryType)){
+			List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"2");
+
+			return signLoadScanByIds(scanLoadIds,warehouseId);
 
-		return signLoadScanByIds(scanLoadIds,warehouseId);
+		}else{
+			log.warn("#############signCars: 三方中转送货方式不存在 loadId={}", loadId);
+			return R.fail(405,"三方中转送货方式不存在");
+		}
+
+
+//		List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndNoScanStatus(loadId,"3");
+//		List<Long> 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<TrunklineCarsL
 	@Override
 	public R loadingDetail(LoadCarsDTO loadCarsDTO) {
 
+		Long loadId = loadCarsDTO.getLoadId();
+
+		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("################loadingDetail: 配载信息不存在 loadId={}",loadId);
+			return R.fail(405,"配载信息不存在");
+		}
+
+
 		IPage<Object> page = new Page<>();
 		page.setCurrent(loadCarsDTO.getPageNum());
 		page.setSize(loadCarsDTO.getPageSize());
@@ -3439,7 +3471,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			});
 		}
 		pageList.setRecords(records);
-		return R.data(pageList);
+
+		Map<String, Object> 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<TrunklineCarsL
 				.filter(parcelListEntity -> !"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<String> noPlanPackageList = new ArrayList<>();

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();
+	}
+}

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) {}
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -495,8 +495,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		}
 		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 		if (Objects.isNull(parcelListEntity)) {
-			log.warn("##############orderScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			TrunklineAdvanceDetailEntity trunklineAdvanceDetail = trunklineAdvanceDetailClient.findEntityByOrderPackageCode(orderPackageCode);
-			return Resp.scanFail(2001, "包件不存在", "系统无编码");
+			if(Objects.isNull(trunklineAdvanceDetail)){
+				log.warn("##############orderScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+				return Resp.scanFail(2001, "包件不存在", "系统无编码");
+			}
+
+			log.warn("##############orderScanOrderPackageCode: 包件不在当前仓 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			return Resp.scanFail(2001, "包件不在当前仓", "包件不在当前仓");
 		}
 		String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
 		if (!"20".equals(orderPackageStatus)) {
@@ -536,7 +542,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		if (Objects.isNull(trayTypeEntity)) {
 			//如果为空则该托盘为空
 			//第一次存入数据
-			trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId, parcelListEntity, stockArticleEntity, warehouseId);
+			try{
+				trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId, parcelListEntity, stockArticleEntity, warehouseId);
+			}catch (CustomerException e){
+				return R.fail(e.code,e.message);
+			}catch (Exception e){
+				return R.fail(500,e.getMessage());
+			}
 		}
 		String tt = trayTypeEntity.getTrayType();
 		Long filterId = trayTypeEntity.getFilterId();
@@ -1112,7 +1124,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		if (Objects.isNull(trayTypeEntity)) {
 			//如果为空则该托盘为空
 			//第一次存入数据
-			trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId, parcelListEntity, stockArticleEntity, warehouseId);
+			try{
+				trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId, parcelListEntity, stockArticleEntity, warehouseId);
+			}catch (CustomerException e){
+				return R.fail(e.code,e.message);
+			}catch (Exception e){
+				return R.fail(500,e.getMessage());
+			}
 		}
 
 		String filterValue = trayTypeEntity.getFilterValue();
@@ -1386,7 +1404,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		if (Objects.isNull(trayTypeEntity)) {
 			//如果为空则该托盘为空
 			//第一次存入数据
-			trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId, parcelListEntity, stockArticleEntity, warehouseId);
+			try{
+				trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId, parcelListEntity, stockArticleEntity, warehouseId);
+			}catch (CustomerException e){
+				return R.fail(e.code,e.message);
+			}catch (Exception e){
+				return R.fail(500,e.getMessage());
+			}
+
 		}
 		String tt = trayTypeEntity.getTrayType();
 		Long filterId = trayTypeEntity.getFilterId();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -15,6 +15,8 @@ import com.logpm.distribution.feign.IDistributionParcelListClient;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.distribution.feign.IDistributionStockListClient;
 import com.logpm.distribution.feign.IDistributionStockListInfoClient;
+import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient;
 import com.logpm.warehouse.bean.Resp;
 import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.entity.*;
@@ -69,6 +71,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 	private final ISendFanoutService sendFanoutService;
 	private final IWarehousePackageTrackLogService warehousePackageTrackLogService;
 	private final BladeRedis bladeRedis;
+	private final ITrunklineAdvanceDetailClient trunklineAdvanceDetailClient;
 
 	@Override
 	public boolean packageChangeStock(List<String> orderPackageCodes) {
@@ -508,15 +511,21 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			//包条码查询服务号维度
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(code, warehouseId);
 			if (Objects.isNull(parcelListEntity)) {
-				log.warn("#################findUpShelfScanGoods: 包件信息不存在 code={}", code);
+				TrunklineAdvanceDetailEntity trunklineAdvanceDetail = trunklineAdvanceDetailClient.findEntityByOrderPackageCode(code);
-				throw new CustomerException(403, "包件信息不存在");
+				if(Objects.isNull(trunklineAdvanceDetail)){
+					log.warn("##############findUpShelfScanGoods: 包件不存在 orderPackageCode={} warehouseId={}", code, warehouseId);
+					throw new CustomerException(403, "系统无编码");
+				}
+
+				log.warn("##############findUpShelfScanGoods: 包件不在当前仓 orderPackageCode={} warehouseId={}", code, warehouseId);
+				throw new CustomerException(403, "包件不在当前仓");
 			}
 			String orderCode = parcelListEntity.getOrderCode();
-			Long wid = parcelListEntity.getWarehouseId();
+//			Long wid = parcelListEntity.getWarehouseId();
-			if (!wid.equals(warehouseId)) {
+//			if (!wid.equals(warehouseId)) {
-				log.warn("#################findUpShelfScanGoods: 包件不在当前仓库 orderPackageCode={}", code);
+//				log.warn("#################findUpShelfScanGoods: 包件不在当前仓库 orderPackageCode={}", code);
-				throw new CustomerException(403, "包件不在当前仓库");
+//				throw new CustomerException(403, "包件不在当前仓库");
-			}
+//			}
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 			if (Objects.isNull(stockArticleEntity)) {
 				log.warn("#################findUpShelfScanGoods: 订单信息不存在 orderCode={}", orderCode);
@@ -544,15 +553,22 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		} else if (upshelfScanType == 2) {
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(code, warehouseId);
 			if (Objects.isNull(parcelListEntity)) {
-				log.warn("#################findUpShelfScanGoods: 包件信息不存在 orderPackageCode={}", code);
+				TrunklineAdvanceDetailEntity trunklineAdvanceDetail = trunklineAdvanceDetailClient.findEntityByOrderPackageCode(code);
-				throw new CustomerException(403, "包件信息不存在");
+				if(Objects.isNull(trunklineAdvanceDetail)){
+					log.warn("##############findUpShelfScanGoods: 包件不存在 orderPackageCode={} warehouseId={}", code, warehouseId);
+					throw new CustomerException(403, "系统无编码");
+				}
+
+				log.warn("##############findUpShelfScanGoods: 包件不在当前仓 orderPackageCode={} warehouseId={}", code, warehouseId);
+				throw new CustomerException(403, "包件不在当前仓");
+
 			}
 			String orderCode = parcelListEntity.getOrderCode();
-			Long wid = parcelListEntity.getWarehouseId();
+//			Long wid = parcelListEntity.getWarehouseId();
-			if (!wid.equals(warehouseId)) {
+//			if (!wid.equals(warehouseId)) {
-				log.warn("#################findUpShelfScanGoods: 包件不在当前仓库 orderPackageCode={}", code);
+//				log.warn("#################findUpShelfScanGoods: 包件不在当前仓库 orderPackageCode={}", code);
-				throw new CustomerException(403, "包件不在当前仓库");
+//				throw new CustomerException(403, "包件不在当前仓库");
-			}
+//			}
 
 			Map map = distributionStockArticleClient.findShelfNumByOrderCodeAndWarehouseId(orderCode, warehouseId);
 			if (Objects.isNull(map)) {
@@ -573,14 +589,20 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			//包条码查询服务号维度
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(code, warehouseId);
 			if (Objects.isNull(parcelListEntity)) {
-				log.warn("#################findUpShelfScanGoods: 包件信息不存在 code={}", code);
+				TrunklineAdvanceDetailEntity trunklineAdvanceDetail = trunklineAdvanceDetailClient.findEntityByOrderPackageCode(code);
-				throw new CustomerException(403, "包件信息不存在");
+				if(Objects.isNull(trunklineAdvanceDetail)){
-			}
+					log.warn("##############findUpShelfScanGoods: 包件不存在 orderPackageCode={} warehouseId={}", code, warehouseId);
-			Long wid = parcelListEntity.getWarehouseId();
+					throw new CustomerException(403, "系统无编码");
-			if (!wid.equals(warehouseId)) {
+				}
-				log.warn("#################findUpShelfScanGoods: 包件不在当前仓库 orderPackageCode={}", code);
+
-				throw new CustomerException(403, "包件不在当前仓库");
+				log.warn("##############findUpShelfScanGoods: 包件不在当前仓 orderPackageCode={} warehouseId={}", code, warehouseId);
+				throw new CustomerException(403, "包件不在当前仓");
 			}
+//			Long wid = parcelListEntity.getWarehouseId();
+//			if (!wid.equals(warehouseId)) {
+//				log.warn("#################findUpShelfScanGoods: 包件不在当前仓库 orderPackageCode={}", code);
+//				throw new CustomerException(403, "包件不在当前仓库");
+//			}
 			String orderCode = parcelListEntity.getOrderCode();
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 			if (Objects.isNull(stockArticleEntity)) {