diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/ApsProduceClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/ApsProduceClient.java index ac78c5c7..6d1e50d4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/ApsProduceClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/ApsProduceClient.java @@ -49,6 +49,7 @@ public class ApsProduceClient implements IApsProduceClient { Date startTime = Date.from(LocalDateTime.now().minusHours(1).withMinute(0).withSecond(0).withNano(0).atZone(ZoneId.systemDefault()).toInstant()); Date endTime = Date.from(LocalDateTime.now().minusHours(1).withMinute(59).withSecond(59).withNano(999_999_999).atZone(ZoneId.systemDefault()).toInstant()); List orders = yieldOrderService.list(Wrappers.lambdaQuery().eq(YieldOrder::getValidationResult, YieldOrderEnum.VALIDATION_RESULT_PASS.getCode()).between(YieldOrder::getUpdateTime, startTime, endTime)); + log.info("待自动接收订单数量:{}", orders.size()); for (YieldOrder yieldOrder : orders) { try { yieldOrderService.confirm(yieldOrder.getCardNo(), "0"); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index e3faf511..837b1581 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -161,7 +161,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl queryWrapper = Wrappers.lambdaQuery(ProReTemplate.class); queryWrapper.eq(wcId != null, ProReTemplate::getWcId, wcId); queryWrapper.eq(ProReTemplate::getPpsId, ppsId); - queryWrapper.eq(ProReTemplate::getLine, aTrue ? "0" : "1"); + queryWrapper.eq(ProReTemplate::getLine, aTrue ? "1" : "0"); queryWrapper.eq(ProReTemplate::getStatus, 2); return this.list(queryWrapper); }