diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java index e449e4e..d93e534 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java @@ -17,5 +17,6 @@ public class ReceiveJob { private String jobId; private String roadwayId; private String warehouseId; + private Long priority; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index 3b91aff..3add855 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -368,6 +368,7 @@ public class ApiServiceImpl implements IApiService { mydoJob.setCreateTime(DateUtils.getNowDate()); mydoJob.setExecutionPhase("0"); mydoJob.setWarehouseId(receiveOutJob.getWarehouseId()); + mydoJob.setPriority(receiveOutJob.getPriority()); int i = mydoJobService.insertMydoJob(mydoJob); if (i > 0) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/util/CheckWeight.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/util/CheckWeight.java index 1fdc588..b3d1384 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/util/CheckWeight.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/util/CheckWeight.java @@ -22,19 +22,19 @@ public class CheckWeight { // 只清空 300ms 内收到的历史数据 // 时间到立刻停止清空,开始读最新重量 byte[] clearBuf = new byte[4096]; - long endClearTime = System.currentTimeMillis() + 1000; // 最多清300毫秒 + long endClearTime = System.currentTimeMillis() + 800; // 最多清300毫秒 while (System.currentTimeMillis() < endClearTime) { if (is.available() > 0) { is.read(clearBuf); } else { - Thread.sleep(5); + Thread.sleep(50); } } // ======================================================================== // 清空完成 → 读取最新数据 - Thread.sleep(100); + Thread.sleep(200); byte[] bytes = new byte[256]; int read = is.read(bytes); if (read != -1) { diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index fc0f85d..f86b555 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -249,5 +249,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and status = #{status} and roadway_id = #{roadwayId} and warehouse_id = #{warehouseId} + order by priority desc,create_time asc