工单超时、签收BUG修复

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/config/XxlJobConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author xuxueli 2017-04-28
  */
-//@Configuration(proxyBeanMethods = false)
+@Configuration(proxyBeanMethods = false)
 public class XxlJobConfig {
 	private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
 
@@ -38,7 +38,7 @@ public class XxlJobConfig {
 	private int logRetentionDays;
 
 
-//	@Bean
+	@Bean
 	public XxlJobSpringExecutor xxlJobExecutor() {
 		logger.info(">>>>>>>>>>> xxl-job config init.");
 		XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java

@@ -17,6 +17,7 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springblade.core.secure.BladeUser;
@@ -37,6 +38,7 @@ import java.util.*;
  */
 @AllArgsConstructor
 @Component
+@Slf4j
 public class AftersalesXxlJob {
 	private static final Logger logger = LoggerFactory.getLogger(AftersalesXxlJob.class);
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesOvertimeFineMapper.xml

@@ -25,10 +25,20 @@
         <result column="remarks" property="remarks"/>
     </resultMap>
     <select id="pageListOwn" resultType="com.logpm.aftersales.vo.AftersalesOvertimeFineVO" >
-        select laof.id,lawo.work_order_number workOrderNumber,lawo.work_order_type workOrderType,lawo.discovery_node discoveryNode,COUNT(laof.id) ,laof.create_time createTime,
+        SELECT
-               laof.timeout,laof.money,laof.business_name businessName,lawo.id workOrderId
+        laof.id,
-        from logpm_aftersales_overtime_fine  laof
+        lawo.work_order_number workOrderNumber,
-       LEFT JOIN logpm_aftersales_work_order lawo on lawo.id = laof.work_order_id
+        lawo.work_order_type workOrderType,
+        lawo.discovery_node discoveryNode,
+        COUNT( laof.id ),
+        laof.create_time createTime,
+        laof.timeout,
+        laof.money,
+        laof.business_name businessName,
+        lawo.id workOrderId
+        FROM
+        logpm_aftersales_overtime_fine laof
+        LEFT JOIN logpm_aftersales_work_order lawo ON lawo.id = laof.work_order_id
         <where>
             <if test=" param.id != null and param.id != ''">and laof.id = #{param.id }</if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != ''">and lawo.work_order_number LIKE '%${param.workOrderNumber}%'</if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -888,7 +888,10 @@
         INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrs.parce_list_id = ldpl.id
         LEFT JOIN logpm_distribution_stock_article As ldsa ON ldpl.stock_article_id = ldsa.id
         WHERE
-        ldrs.packet_bar_status IN ('1','3') and reservation_id = #{reservationId} AND ldpl.conditions = 1 AND ldpl.is_transfer = 0
+        ldrs.packet_bar_status IN ('1','3')
+        AND reservation_id = #{reservationId}
+        AND ldpl.conditions = 1
+        AND ldpl.is_transfer = 0
     </select>
     <select id="getReservationNumStockSelf" resultType="Integer">
         select IFNULL(SUM(lddd.quantity),0)

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -1461,9 +1461,8 @@
         LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND
         ldl.scan_status != 1 AND ldl.reservation_id = ldr.id
         WHERE
-        ldrp.packet_bar_status != 2
+        ldr.is_deleted = 0
         AND ldr.id = #{reservationId}
-        AND ldr.is_deleted = 0
         AND ldr.reservation_status != 40
         UNION
         SELECT