生产管理修改

master
李涛 3 days ago
parent 7c98924141
commit 7d11f02b28
  1. 30
      blade-ops/blade-job/src/main/java/org/springblade/job/processor/produce/DisTaskingProcessor.java
  2. 29
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/feign/IDisTaskingClient.java
  3. 26
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/DisTaskingClient.java
  4. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DisTaskingServiceImpl.java

@ -0,0 +1,30 @@
package org.springblade.job.processor.produce;
import jakarta.annotation.Resource;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springblade.desk.produce.feign.IDisTaskingClient;
import org.springframework.stereotype.Component;
import tech.powerjob.worker.core.processor.ProcessResult;
import tech.powerjob.worker.core.processor.TaskContext;
import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
/**
* 调度任务同步
*
* @author litao
*/
@Component
@Data
@Slf4j
public class DisTaskingProcessor implements BasicProcessor {
@Resource
private IDisTaskingClient client;
@Override
public ProcessResult process(TaskContext context) throws Exception {
log.info("调度任务同步开始");
return new ProcessResult(client.syncDisTasking());
}
}

@ -0,0 +1,29 @@
package org.springblade.desk.produce.feign;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
/**
* 调度任务同步接口
*
* @author litao
*/
@FeignClient(
value = AppConstant.APPLICATION_DESK_NAME
)
public interface IDisTaskingClient {
String API_PREFIX = "/feign/client/disTasking";
String SYNC_DIS_TASKING = API_PREFIX + "/syncDisTasking";
/**
* 调度任务同步接口
* @return
*/
@GetMapping(SYNC_DIS_TASKING)
boolean syncDisTasking();
}

@ -0,0 +1,26 @@
package org.springblade.desk.produce.feign;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.RequiredArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.desk.produce.service.IDisTaskingService;
import org.springframework.web.bind.annotation.RestController;
/**
* Feign 调度任务同步接口
*
* @author litao
*/
@NonDS
@Hidden()
@RestController
@RequiredArgsConstructor
public class DisTaskingClient implements IDisTaskingClient {
private final IDisTaskingService disTaskingService;
@Override
public boolean syncDisTasking() {
return disTaskingService.syncDisTasking(false);
}
}

@ -165,6 +165,7 @@ public class DisTaskingServiceImpl extends BaseServiceImpl<DisTaskingMapper, Dis
} }
if (CollectionUtils.isEmpty(dsTaskingEntities)) { if (CollectionUtils.isEmpty(dsTaskingEntities)) {
log.error("没有需要同步的工艺任务分派数据");
return false; return false;
} }
@ -228,10 +229,12 @@ public class DisTaskingServiceImpl extends BaseServiceImpl<DisTaskingMapper, Dis
return false; return false;
} }
boolean saveResult = this.saveBatch(disTaskings); boolean saveResult = this.saveBatch(disTaskings);
log.info("保存 {} 个工艺任务分派数据", disTaskings.size());
if (saveResult && !CollectionUtils.isEmpty(workOrders)) { if (saveResult && !CollectionUtils.isEmpty(workOrders)) {
// 更新工单状态逻辑 // 更新工单状态逻辑
saveResult = workOrderService.update(Wrappers.lambdaUpdate(WorkOrder.class).in(WorkOrder::getId, workOrders).set(WorkOrder::getRunStatus, WorkOrder.RUN_STATUS_CRAFT_CHANGE)); saveResult = workOrderService.update(Wrappers.lambdaUpdate(WorkOrder.class).in(WorkOrder::getId, workOrders).set(WorkOrder::getRunStatus, WorkOrder.RUN_STATUS_CRAFT_CHANGE));
log.info("更新 {} 个工单状态为 工艺变更", workOrders.size());
} }
return saveResult; return saveResult;
} }

Loading…
Cancel
Save