Merge remote-tracking branch 'origin/master'

smart-rack-base-system/src/main/java/com/zehong/system/service/impl/shelf/TShelfStorageLocationServiceImpl.java

 package com.zehong.system.service.impl.shelf;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zehong.system.mapper.shelf.TShelfStorageLocationMapper;
 import com.zehong.system.domain.shelf.TShelfStorageLocation;
+import com.zehong.system.mapper.shelf.TShelfStorageLocationMapper;
 import com.zehong.system.service.shelf.ITShelfStorageLocationService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 储位信息Service业务层处理
@@ -16,7 +17,7 @@ import com.zehong.system.service.shelf.ITShelfStorageLocationService;
 @Service
 public class TShelfStorageLocationServiceImpl implements ITShelfStorageLocationService 
 {
-    @Autowired
+    @Resource
     private TShelfStorageLocationMapper tShelfStorageLocationMapper;
 
     /**

smart-rack-base-system/src/main/java/com/zehong/system/service/impl/shelf/aspectj/PlatformDockingTaskAspect.java

@@ -34,7 +34,7 @@ public class PlatformDockingTaskAspect {
     @Pointcut("@annotation(platformDockingTaskLog)")
     public void platformDockingTaskPointcut(PlatformDockingTaskLog platformDockingTaskLog) {}
 
-    // 后置通知：在方法执行后发送通知
+    // 后置通知：在方法执行后记录日志信息
     @AfterReturning(pointcut="platformDockingTaskPointcut(platformDockingTaskLog)",returning = "result")
     public void insertPlatformDockingTaskLog(JoinPoint joinPoint,PlatformDockingTaskLog platformDockingTaskLog, Object result) {
         DockingTaskType type = platformDockingTaskLog.type();

smart-rack-base-system/src/main/resources/mapper/shelf/TShelfStorageLocationMapper.xml

@@ -80,9 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="label != null">f_label = #{label},</if>
             <if test="index != null">f_index = #{index},</if>
             <if test="rid != null and inboundTime != null">f_rid = #{rid},</if>
-            <if test="rid != null and outboundTime != null">f_rid = null,</if>
             <if test="inboundTime != null">f_inbound_time = #{inboundTime},</if>
-            <if test="outboundTime != null">f_outbound_time = #{outboundTime},</if>
+            <if test="outboundTime != null">
+                f_rid = null,
+                f_inbound_time = null,
+                f_outbound_time = #{outboundTime},
+            </if>
         </trim>
         where f_location = #{location} AND f_shelf_id = #{shelfId}
     </update>