diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java index 69c4975d..ef6cd710 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/logistics/OrderBoxRefinement.java @@ -1,7 +1,10 @@ package org.springblade.job.processor.logistics; +import jakarta.annotation.Resource; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.dashboard.feign.IOrderBoxClient; +import org.springblade.desk.dashboard.feign.IPartClient; import org.springframework.stereotype.Component; import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.TaskContext; @@ -14,10 +17,12 @@ import tech.powerjob.worker.core.processor.sdk.BasicProcessor; @Data @Slf4j public class OrderBoxRefinement implements BasicProcessor { + @Resource + private IOrderBoxClient client; + @Override - public ProcessResult process(TaskContext taskContext) throws Exception { - System.out.println("hello world"); - log.info("hello world"); + public ProcessResult process(TaskContext context) throws Exception { + client.monitoringStation(); return new ProcessResult(true); } } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/feign/IOrderBoxClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/feign/IOrderBoxClient.java new file mode 100644 index 00000000..27485cd1 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/feign/IOrderBoxClient.java @@ -0,0 +1,32 @@ +package org.springblade.desk.dashboard.feign; + +import org.springblade.core.launch.constant.AppConstant; +import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * 零件服务Feign客户端 + * 修正点:所有GET请求参数添加@RequestParam注解,解决Feign多Body参数异常 + * @author liweidong + */ +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IOrderBoxClient { + + String API_PREFIX = "/feign/client/order-box"; + + String MONITORING_STATION = API_PREFIX + "/monitoring-station"; + + + /** + * 零件同步 + */ + @GetMapping(MONITORING_STATION) + void monitoringStation(); +} \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/feign/OrderBoxClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/feign/OrderBoxClient.java new file mode 100644 index 00000000..32c87b00 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/feign/OrderBoxClient.java @@ -0,0 +1,28 @@ +package org.springblade.desk.dashboard.feign; + +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.annotation.Resource; +import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import org.springblade.desk.dashboard.service.IDsPartRelationService; +import org.springblade.desk.dashboard.service.IDsPartService; +import org.springblade.desk.dashboard.service.IDsTaskingService; +import org.springblade.desk.logistics.service.IStorageMonitoringService; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@Hidden() +public class OrderBoxClient implements IOrderBoxClient { + + @Resource + private IStorageMonitoringService storageMonitoringService; + + + @Override + public void monitoringStation() { + storageMonitoringService.monitoringStation(); + } +} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java index cf491320..dc54338a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBindController.java @@ -20,6 +20,7 @@ import org.springblade.desk.logistics.pojo.vo.OrderBindVO; import org.springblade.desk.logistics.pojo.vo.TaskVO; import org.springblade.desk.logistics.service.IOrderBindService; import org.springblade.desk.logistics.service.IOrderBoxService; +import org.springblade.desk.order.service.IYieldOrderService; import org.springframework.web.bind.annotation.*; /** @@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.*; public class OrderBindController { private final IOrderBindService iOrderBindService; private final IOrderBoxService iOrderBoxService; + private final IYieldOrderService iYieldOrderService; @PostMapping("/box-binding") @ApiOperationSupport(order = 1) @@ -82,6 +84,15 @@ public class OrderBindController { return iOrderBindService.getBoxcodelist(); } + @GetMapping("/card-no") + @ApiOperationSupport(order = 5) + @Operation( + summary = "根据流程卡号查询", + description = "根据流程卡号查询" + ) + public R getCardNo(String cardNo) throws BusinessException { + return iYieldOrderService.getCardNo(cardNo); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java index 19aa9e01..89c9edac 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java @@ -90,7 +90,7 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService { * - 库位ID/任务/库位信息空值校验,跳过异常数据 * - 状态未变化时跳过更新,减少数据库IO */ - @Scheduled(cron = "0 0/5 * * * ?") +// @Scheduled(cron = "0 0/5 * * * ?") @Override // 实现IStorageMonitoringService接口的抽象方法 public void monitoringStation() { // ========== 步骤1:查询所有空闲状态的站点 ========== diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java index fe589c31..b1b73668 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.validation.constraints.NotEmpty; import org.springblade.common.exception.BusinessException; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; import org.springblade.desk.order.pojo.entity.YieldOrder; import java.util.List; @@ -215,4 +216,6 @@ public interface IYieldOrderService extends BaseService { String getNewCardNo(String cardNo); Long getWcId(Long orderId); + + R getCardNo(String cardNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 289e1344..f23f2a6d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -16,6 +16,7 @@ import org.springblade.common.utils.StringPrefixUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.ObjectUtil; @@ -725,6 +726,19 @@ public class YieldOrderServiceImpl extends BaseServiceImpl list = list(new LambdaQueryWrapper().eq(YieldOrder::getCardNo, cardNo)); + if (list==null||list.size()==0) { + return R.fail("路线卡号未查询到详情"); + } + + return R.data(list.get(0)); + } + /** * 验证零件子件信息 *