Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs

wang..123

2022-02-18 4901728f970314cddd9fa167cf3d3fb9476208e5

 src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java

@@ -24,9 +24,9 @@
            int updateCount = jdbcTemplate.update("insert into asr_stk_hplc select * from asr_stk_plcm where dateadd(day,7,appe_time) <= getdate();");
            if (updateCount > 0) {
                int deleteCount = jdbcTemplate.update("delete from asr_stk_plcm where dateadd(day,7,io_time) <= getdate();");
                if (deleteCount <= 0) {
                    exceptionHandle("堆垛机&PLC命令转历史档错误 ! ");
                }
//                if (deleteCount <= 0) {
//                    exceptionHandle("堆垛机&PLC命令转历史档错误 ! ");
//                }
            }

//            //条码组托数据转历史档 2021-09-10 TQS ADD