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

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -198,6 +198,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     if (ObjectUtil.isEmpty(taskObj)){
                         throw new BadRequestException("未找到任务标识为：" + task_id + "的任务！");
                     }
+                    if ("1".equals(taskObj.getString("is_delete"))){
+                        log.debug(task_id+"当前LMS任务已删除，不需要再次反馈更新！");
+                        continue;
+                    }
+                    if ("08,07".contains(taskObj.getString("task_status"))){
+                        log.debug(task_id+"当前LMS任务完成或取消，不需要再次反馈更新！");
+                        continue;
+                    }
                     if (StrUtil.isNotEmpty(row.getString("car_no"))) {
                         WQLObject.getWQLObject("SCH_BASE_Task")
                                 .update(MapOf.of("car_no",row.getString("car_no")),"task_id = '" + task_id + "'");