diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteShiftingTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteShiftingTask.java index 8d6fc7dc4..6dab09d7c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteShiftingTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteShiftingTask.java @@ -39,7 +39,11 @@ public class AutoExecuteShiftingTask { //自动执行等待的桁架任务 public void run() { - this.executeShiftingTask(); + try { + this.executeShiftingTask(); + }catch (Exception ex){ + log.error(ex.getMessage()); + } } /** diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java index 9c474e231..f7f526ff1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoExecuteWaitTask.java @@ -52,7 +52,11 @@ public class AutoExecuteWaitTask extends Prun{ //自动执行等待的桁架任务 @Autowired public void run() { - this.executeWaitTask(); + try { + this.executeWaitTask(); + }catch (Exception ex){ + log.error(ex.getMessage()); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java index d9f8b6073..eaa2ce7fe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java @@ -49,7 +49,11 @@ public class AutoSendDjqToGzq { //待检区->管制区agv自动搬运任务 public void run() { - this.sendDjqToGzq(); + try { + this.sendDjqToGzq(); + }catch (Exception ex){ + log.error(ex.getMessage()); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java index cf146ae79..45e23ef9f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java @@ -42,7 +42,11 @@ public class AutoSendGzqToDjq { //管制区->待检区agv自动搬运任务 public void run() { - this.sendGzqToDjq(); + try { + this.sendGzqToDjq(); + }catch (Exception ex){ + log.error(ex.getMessage()); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java index 524ab04db..704b93bf6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java @@ -50,7 +50,11 @@ public class AutoSendMzToDjq { //满轴->待检区agv自动搬运任务 public void run() { - this.sendMzqToDjq(); + try { + this.sendMzqToDjq(); + }catch (Exception ex){ + log.error(ex.getMessage()); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java index aa6fca6af..50ffcf65d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendToZxq.java @@ -45,7 +45,12 @@ public class AutoSendToZxq extends Prun{ //待检区->装箱区agv自动搬运任务 @Autowired public void run() { - this.sendDjqToZxq(); + try { + this.sendDjqToZxq(); + }catch (Exception ex){ + log.error(ex.getMessage()); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java index c76ced10e..0dee54359 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java @@ -53,7 +53,12 @@ public class AutoSendVehicleToDjq extends Prun{ //装箱区->待检区或管制区补空载具 @Autowired public void run() { - this.sendVehicleToDjqOrGzq(IOSEnum.IS_NOTANDYES.code("否"),null); + try { + this.sendVehicleToDjqOrGzq(IOSEnum.IS_NOTANDYES.code("否"),null); + }catch (Exception ex){ + log.error(ex.getMessage()); + } + } @SneakyThrows diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index 31fa2ac7c..f961129f2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -16,6 +16,7 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.sch.tasks.first_floor_area.DjqToKzjhcwTask; import org.nl.b_lms.sch.tasks.first_floor_area.GzqToKzjhcwTask; import org.nl.b_lms.sch.tasks.first_floor_area.ShiftingTask; +import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -51,7 +52,12 @@ public class AutoSendVehicleToKzj { //待检区或管制区->空载具缓存位补空 public void run() { - this.toKzjHcw(); + try { + this.toKzjHcw(); + }catch (Exception ex){ + log.error(ex.getMessage()); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java index 66443701b..8de79c811 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java @@ -78,7 +78,11 @@ public class AutoSendZxToDjw extends Prun{ //装箱区->装箱对接位agv自动搬运任务 @Autowired public void run() { - this.sendZxToDjw(); + try { + this.sendZxToDjw(); + }catch (Exception ex){ + log.error(ex.getMessage()); + } } @SneakyThrows diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java index 450ed20c5..239c33341 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java @@ -146,7 +146,9 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { JSONObject jsonAttr = attrTab.query("struct_code = '" + taskDao.getPoint_code1() + "'").uniqueResult(0); jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("货位异常锁")); attrTab.update(jsonAttr); - + if (taskDao.getPoint_code2().contains("ZXQ")){ + throw new BadRequestException("当前木箱出库至ZXQ,木箱空出异常"); + } // 重新分配货位 BstIvtBoxinfo boxDao = bstIvtBoxinfoMapper.selectOne( new QueryWrapper().lambda()