diff --git a/youchain-logging/src/main/java/com/youchain/repository/LogRepository.java b/youchain-logging/src/main/java/com/youchain/repository/LogRepository.java index 1de495d..476b711 100644 --- a/youchain-logging/src/main/java/com/youchain/repository/LogRepository.java +++ b/youchain-logging/src/main/java/com/youchain/repository/LogRepository.java @@ -56,6 +56,6 @@ public interface LogRepository extends JpaRepository, JpaSpecificatio */ @Modifying @Transactional - @Query(value = "delete from sys_log where create_time < DATE_SUB(NOW(), INTERVAL 1 MONTH) ", nativeQuery = true) + @Query(value = "delete from sys_log where create_time < DATE_SUB(NOW(), INTERVAL 1 MONTH) LIMIT 10000 ", nativeQuery = true) void cleanSysLog(); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java index 96b3000..0f03ce4 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java @@ -339,7 +339,7 @@ public class MesServiceImpl implements MesService { private void moveFxOffLine(TransTask transTask) { if (!gtLineMap.containsKey(transTask.getPointCode())) { - throw new BadRequestException(transTask.getPointCode() + "点位不存在,请核实!"); + throw new BadRequestException(transTask.getPointCode() + "点位不是下线点,请核实!"); } List points = gtLineMap.getData(transTask.getPointCode()); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java index 95f4c5d..5fe4a97 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java @@ -159,7 +159,7 @@ public class TaskServiceImpl implements TaskService { @Override @Transactional(rollbackFor = Exception.class) - public void allocatePick(Pick pick) { + public synchronized void allocatePick(Pick pick) { //目标库位 Point endPoint = null; diff --git a/youchain-system/src/main/java/com/youchain/utils/GtLineMap.java b/youchain-system/src/main/java/com/youchain/utils/GtLineMap.java index 3c02f63..6322569 100644 --- a/youchain-system/src/main/java/com/youchain/utils/GtLineMap.java +++ b/youchain-system/src/main/java/com/youchain/utils/GtLineMap.java @@ -21,8 +21,8 @@ public class GtLineMap { // 初始化Map dataMap.put("BYDGT006", Arrays.asList("FX001", "BYDGT002")); dataMap.put("BYDGT007", Arrays.asList("FX001", "BYDGT002")); - dataMap.put("BVDGT001", Arrays.asList("FX001", "BYDGT002")); - dataMap.put("BXDGT003", Arrays.asList("FX001", "BYDGT004")); + dataMap.put("BYDGT001", Arrays.asList("FX001", "BYDGT002")); + dataMap.put("BYDGT003", Arrays.asList("FX001", "BYDGT004")); dataMap.put("BYDGT005", Arrays.asList("FX001", "BYDGT008")); }