问题修改

src/main/java/com/tld/config/MyRedissonConfig.java

@@ -16,8 +16,8 @@ public class MyRedissonConfig {
     public RedissonClient redissonClient(){
         // 创建配置 指定redis地址及节点信息
         Config config = new Config();
-//        config.useSingleServer().setAddress("redis://8.142.144.205:6379").setPassword("#09SilverB");
-        config.useSingleServer().setAddress("redis://10.2.111.91:6379").setPassword("#09SilverB");
+        config.useSingleServer().setAddress("redis://8.142.144.205:6379").setPassword("#09SilverB");
+//        config.useSingleServer().setAddress("redis://10.2.111.91:6379").setPassword("#09SilverB");
         //redis集群使用
 //        config.useClusterServers().addNodeAddress("redis://8.142.144.205:6379");
         // 根据config创建出RedissonClient实例

src/main/java/com/tld/config/SaticScheduleTask.java

@@ -46,4 +46,12 @@ public class SaticScheduleTask {
     public void callback(){
         askGoodsService.getCallback();
     }
+
+    /**
+     * 批量回调 入库回传
+     */
+    @Scheduled(cron = "0 */30 * * * ?")
+    public void callPlugOutWarehousing(){
+        askGoodsService.getCallPlugOutWarehousing();
+    }
 }

src/main/java/com/tld/controller/AskGoodsController.java

@@ -439,4 +439,13 @@ public class AskGoodsController {
     public void jsonErrorParking(){
         askGoodsService.jsonErrorParking();
     }
+
+    /**
+     * error错误信息全部跑调用错误回传
+     * */
+    @GetMapping("errorParkingReturn")
+    @PassToken
+    public void errorParkingReturn(){
+        askGoodsService.errorParkingReturn();
+    }
 }

src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -243,4 +243,10 @@ public interface AskGoodsMapper {
     void updErrorParking(Error error);
 
     List<ReturRemoval> getCallback();
+
+    List<Error> getErrorParkingReturn();
+
+    List<Map<String, Object>> getCallPlugOutWarehousing();
+
+    String getUserName(@Param("userName") String userName);
 }

src/main/java/com/tld/service/AskGoodsService.java

@@ -105,4 +105,8 @@ public interface AskGoodsService {
 
     void jsonErrorParking();
     void getCallback();
+
+    void errorParkingReturn();
+
+    void getCallPlugOutWarehousing();
 }

src/main/resources/mapper/AskGoodsMapper.xml

@@ -1496,8 +1496,9 @@
     </select>
     <!--出库错误信息回调-->
     <select id="getOutgoingReturnError" resultType="com.tld.model.Error">
-        select id,url,error_info,data_val,scrq,type,transmission_type from tld_error_excel_parking
-        where transmission_type = '1'
+        select id,url,error_info,data_val,scrq,type,transmission_type from tld_error
+        where transmission_type = '3'
+        and type = '出库回传'
     </select>
     <!--查询销售出库导入数据-->
     <select id="getMarketList" resultType="com.tld.model.MarketReturn">
@@ -1666,6 +1667,31 @@
     <select id="getMaterialCode" resultType="java.lang.String">
         select code from tld_material where tld_id = #{material}
     </select>
+    <!--error错误信息全部跑调用错误回传-->
+    <select id="getErrorParkingReturn" resultType="com.tld.model.Error">
+        select
+            id,
+            url,
+            error_info,
+            data_val,
+            scrq,
+            type,
+            transmission_type
+        from tld_error
+        where transmission_type = '1'
+    </select>
+    <!--查询入库返回GS表信息-->
+    <select id="getCallPlugOutWarehousing" resultType="java.util.Map">
+        select
+            order_number as orderNumber ,
+            user_name as UserName
+        from tld_return_gs_warehousing
+        where source_type  <![CDATA[!=]]> 'W'
+    </select>
+    <!--查询用户信息-->
+    <select id="getUserName" resultType="java.lang.String">
+        select real_name from tld_user where user_name = #{userName}
+    </select>
     <!-- 修改数据传输状态 -->
     <update id="updateRemoval">
         update tld_removal set transmission_type = "1" where storage_code = #{removalCode}