Compare commits
No commits in common. 'master' and 'liweidong' have entirely different histories.
43 changed files with 237 additions and 1107 deletions
@ -1,33 +0,0 @@ |
||||
package org.springblade.job.processor.dashboard; |
||||
|
||||
import jakarta.annotation.Resource; |
||||
import lombok.Data; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.desk.order.feign.IOrderClient; |
||||
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; |
||||
|
||||
import java.util.concurrent.CompletableFuture; |
||||
|
||||
/** |
||||
* 工艺模块-返工任务 |
||||
* @author liweidong |
||||
*/ |
||||
@Component |
||||
@Data |
||||
@Slf4j |
||||
public class CalculateCoatingMaterialProcessor implements BasicProcessor { |
||||
|
||||
@Resource |
||||
private IOrderClient client; |
||||
|
||||
@Override |
||||
public ProcessResult process(TaskContext context) throws Exception { |
||||
log.info("镀层物料需求任务开始"); |
||||
CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()->client.calculateCoatingMaterial()); |
||||
log.info("镀层物料需求任务结束"); |
||||
return new ProcessResult(true); |
||||
} |
||||
} |
||||
@ -1,30 +0,0 @@ |
||||
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 ReworkNoProcessProcessor implements BasicProcessor { |
||||
|
||||
@Resource |
||||
private IDisTaskingClient client; |
||||
|
||||
@Override |
||||
public ProcessResult process(TaskContext context) throws Exception { |
||||
log.info("返工无工艺定时接收"); |
||||
return new ProcessResult(client.receiveOrder()); |
||||
} |
||||
} |
||||
@ -1,115 +0,0 @@ |
||||
package org.springblade.erpdata.pojo.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* 返工计划 视图实体类 |
||||
* |
||||
* @author litao |
||||
*/ |
||||
@Data |
||||
public class MesRbRedoVO { |
||||
|
||||
/** |
||||
* 返修单号 |
||||
*/ |
||||
@Schema(description = "返修单号") |
||||
private String redono; |
||||
/** |
||||
* 发生单位 |
||||
*/ |
||||
@Schema(description = "发生单位") |
||||
private String usedept; |
||||
/** |
||||
* 物料号 |
||||
*/ |
||||
@Schema(description = "物料号") |
||||
private String prtno; |
||||
/** |
||||
* 数量 |
||||
*/ |
||||
@Schema(description = "数量") |
||||
private String amount; |
||||
/** |
||||
* 处理意见 |
||||
*/ |
||||
@Schema(description = "处理意见") |
||||
private String detail; |
||||
/** |
||||
* 备注 |
||||
*/ |
||||
@Schema(description = "备注") |
||||
private String remark; |
||||
/** |
||||
* 需求日期 |
||||
*/ |
||||
@Schema(description = "需求日期") |
||||
private String reqdate; |
||||
/** |
||||
* 批次号 |
||||
*/ |
||||
@Schema(description = "批次号") |
||||
private String splcode; |
||||
/** |
||||
* 生产标识 |
||||
*/ |
||||
@Schema(description = "生产标识") |
||||
private String prtlotno; |
||||
/** |
||||
* 审理员 |
||||
*/ |
||||
@Schema(description = "审理员") |
||||
private String cogncer; |
||||
/** |
||||
* 审理时间 |
||||
*/ |
||||
@Schema(description = "审理时间") |
||||
private String cogncdat; |
||||
/** |
||||
* 型号 |
||||
*/ |
||||
@Schema(description = "型号") |
||||
private String mtltmrk; |
||||
/** |
||||
* 承修部门 |
||||
*/ |
||||
@Schema(description = "承修部门") |
||||
private String prtmdept; |
||||
/** |
||||
* 完成时间 |
||||
*/ |
||||
@Schema(description = "完成时间") |
||||
private String udenddat; |
||||
/** |
||||
* 完成数量 |
||||
*/ |
||||
@Schema(description = "完成数量") |
||||
private String udtotqty; |
||||
/** |
||||
* 报废数 |
||||
*/ |
||||
@Schema(description = "报废数") |
||||
private String udwasqty; |
||||
/** |
||||
* 返工状态 0:等待，1:进行，2:完成 |
||||
*/ |
||||
@Schema(description = "返工状态 0:等待，1:进行，2:完成") |
||||
private Short redostatus; |
||||
/** |
||||
* 工艺路线生成人 |
||||
*/ |
||||
@Schema(description = "工艺路线生成人") |
||||
private String routgenman; |
||||
/** |
||||
* 工艺路线生成时间 |
||||
*/ |
||||
@Schema(description = "工艺路线生成时间") |
||||
private String routgendat; |
||||
/** |
||||
* 工艺路线 |
||||
*/ |
||||
@Schema(description = "工艺路线") |
||||
private String deptcode; |
||||
|
||||
} |
||||
@ -1,185 +0,0 @@ |
||||
package org.springblade.erpdata.pojo.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* erp审理单 视图实体类 |
||||
* |
||||
* @author litao |
||||
*/ |
||||
@Data |
||||
public class PpmReportDetailModelVO { |
||||
|
||||
/** |
||||
* 班组 |
||||
*/ |
||||
@Schema(description = "班组") |
||||
private String tsName; |
||||
/** |
||||
* 审理单号 |
||||
*/ |
||||
@Schema(description = "审理单号") |
||||
private String sheetNo; |
||||
/** |
||||
* 审理单类型 |
||||
*/ |
||||
@Schema(description = "审理单类型") |
||||
private String billmodel; |
||||
/** |
||||
* 审理单状态 |
||||
*/ |
||||
@Schema(description = "审理单状态") |
||||
private String status; |
||||
/** |
||||
* 发生单位 |
||||
*/ |
||||
@Schema(description = "发生单位") |
||||
private String deptcode; |
||||
/** |
||||
* 物料号 |
||||
*/ |
||||
@Schema(description = "物料号") |
||||
private String prtno; |
||||
/** |
||||
* 物料名称 |
||||
*/ |
||||
@Schema(description = "物料名称") |
||||
private String name; |
||||
/** |
||||
* 型号 |
||||
*/ |
||||
@Schema(description = "型号") |
||||
private String type; |
||||
/** |
||||
* 质量等级 |
||||
*/ |
||||
@Schema(description = "质量等级") |
||||
private String qstandno; |
||||
/** |
||||
* 批次号 |
||||
*/ |
||||
@Schema(description = "批次号") |
||||
private String lotno; |
||||
/** |
||||
* 总数量 |
||||
*/ |
||||
@Schema(description = "总数量") |
||||
private String cntt; |
||||
/** |
||||
* 不合格数 |
||||
*/ |
||||
@Schema(description = "不合格数") |
||||
private String cntn; |
||||
/** |
||||
* 检验员 |
||||
*/ |
||||
@Schema(description = "检验员") |
||||
private String checker; |
||||
/** |
||||
* 检验日期 |
||||
*/ |
||||
@Schema(description = "检验日期") |
||||
private String checkdate; |
||||
/** |
||||
* 归档日期 |
||||
*/ |
||||
@Schema(description = "归档日期") |
||||
private String finishdate; |
||||
/** |
||||
* 责任部门 |
||||
*/ |
||||
@Schema(description = "责任部门") |
||||
private String layer1; |
||||
/** |
||||
* 审理单开始时间 |
||||
*/ |
||||
@Schema(description = "审理单开始时间") |
||||
private String judgestart; |
||||
/** |
||||
* |
||||
*/ |
||||
@Schema(description = "") |
||||
private String opinion; |
||||
/** |
||||
* 审理级别 |
||||
*/ |
||||
@Schema(description = "审理级别") |
||||
private String userlevel; |
||||
/** |
||||
* 审理意见 |
||||
*/ |
||||
@Schema(description = "审理意见") |
||||
private String dispose; |
||||
/** |
||||
* 审理人 |
||||
*/ |
||||
@Schema(description = "审理人") |
||||
private String usercode; |
||||
/** |
||||
* 返修数 |
||||
*/ |
||||
@Schema(description = "返修数") |
||||
private String p6layer3; |
||||
/** |
||||
* 返工数 |
||||
*/ |
||||
@Schema(description = "返工数") |
||||
private String p6layer4; |
||||
/** |
||||
* 报废数 |
||||
*/ |
||||
@Schema(description = "报废数") |
||||
private String p6layer5; |
||||
/** |
||||
* 订单号 |
||||
*/ |
||||
@Schema(description = "订单号") |
||||
private String sono; |
||||
/** |
||||
* 完工数 |
||||
*/ |
||||
@Schema(description = "完工数") |
||||
private String avlqty; |
||||
/** |
||||
* 完工日期 |
||||
*/ |
||||
@Schema(description = "完工日期") |
||||
private String date1; |
||||
/** |
||||
* 责任零件 |
||||
*/ |
||||
@Schema(description = "责任零件") |
||||
private String p5layer1; |
||||
/** |
||||
* 责任批次 |
||||
*/ |
||||
@Schema(description = "责任批次") |
||||
private String p5layer3; |
||||
/** |
||||
* 发生工序 |
||||
*/ |
||||
@Schema(description = "发生工序") |
||||
private String process; |
||||
/** |
||||
* 发生工序名称 |
||||
*/ |
||||
@Schema(description = "发生工序名称") |
||||
private String processName; |
||||
/** |
||||
* 上级编号 |
||||
*/ |
||||
@Schema(description = "上级编号") |
||||
private String precode; |
||||
/** |
||||
* 返修路线 |
||||
*/ |
||||
@Schema(description = "返修路线") |
||||
private String reworkLine; |
||||
/** |
||||
* 故障描述 |
||||
*/ |
||||
@Schema(description = "故障描述") |
||||
private String memo; |
||||
|
||||
} |
||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue