diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java index 2bbe7221..4d5fd2ec 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java @@ -412,27 +412,31 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl().lambda() - .eq(SchBasePoint::getPoint_code, whereJson.getString("point_code")) - ); - - PointEvent event = PointEvent.builder() - .type(AcsTaskEnum.TASK_STRUCT_CP_OUT) - .acs_task_type("8") - .task_group_id(IdUtil.getStringId()) - .point_code1(disDao.getStruct_code()) - .point_code3(pointDao.getPoint_code()) - .vehicle_code(disDao.getStoragevehicle_code()) - .product_area("A1") // 暂时写死 - .callback((Consumer) disDao::setTask_id) - .build(); - BussEventMulticaster.Publish(event); - + SchBasePoint pointDao; + if (ObjectUtil.isNotEmpty(disIsnull)) { + disDao.setTask_id(disIsnull.getTask_id()); + pointDao = new SchBasePoint(); + pointDao.setPoint_id(disDao.getPoint_id()); + pointDao.setPoint_code(disDao.getPoint_code()); + pointDao.setPoint_name(disDao.getPoint_name()); + }else { + // 2.下发任务 + pointDao = iSchBasePointService.getOne( + new QueryWrapper().lambda() + .eq(SchBasePoint::getPoint_code, whereJson.getString("point_code")) + ); + PointEvent event = PointEvent.builder() + .type(AcsTaskEnum.TASK_STRUCT_CP_OUT) + .acs_task_type("8") + .task_group_id(IdUtil.getStringId()) + .point_code1(disDao.getStruct_code()) + .point_code3(pointDao.getPoint_code()) + .vehicle_code(disDao.getStoragevehicle_code()) + .product_area("A1") // 暂时写死 + .callback((Consumer) disDao::setTask_id) + .build(); + BussEventMulticaster.Publish(event); + } // 3.更新分配表 iostorinvdisCpService.update( new UpdateWrapper().lambda()