diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/mapper/AgvTaskMapper.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/mapper/AgvTaskMapper.java index 460e133..cf4329b 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/mapper/AgvTaskMapper.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/mapper/AgvTaskMapper.java @@ -82,12 +82,4 @@ public interface AgvTaskMapper extends BaseMapper { @Select(value = "select * from data_agv_task where type in ('INBOUND','OUTBOUND') and status=2 LIMIT 5") List queryExecuteTopFive(); - /** - * 根据起点编码验证AGV任务是否存在 - * - * @param startCode 起点 - */ - @Select(value = "select 1 from data_agv_task where start_code = #{startCode} and status in (1,2,3) and type = 'OUTBOUND' LIMIT 1 ") - Integer existsOutAgv(@Param("startCode") String startCode); - } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java index a5372e1..de05416 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/processor/AllocateProcessor.java @@ -971,13 +971,13 @@ public class AllocateProcessor { for (Inventory inv : moveInventoryList) { try { //如果移位库位已有出库任务则不需要生成移位任务 - Point movePoint = pointMap.get(inv.getPointId()); - if (agvTaskMapper.existsOutAgv(movePoint.getPointCode())!=null) { + Stock stock = stockMap.get(inv.getStockId()); + if (agvTaskMapper.existsByStockCode(stock.getStockCode(),AgvVendorEnum.TES.getValue())!=null) { continue; } Item moveItem = moveItemMap.get(inv.getItemId()); Point fromPoint = fromPointMap.get(inv.getPointId()); - Stock stock = stockMap.get(inv.getStockId()); + String taskNo = moveSerialNumberRule.generateSerialNumber(GeneralConstant.MOVE_ORDER_NO); //根据算法找到最优的目标库位 Point toPoint = allocatePoint(fromPoint, itemKeyMap.get(inv.getItemKeyId()));