李涛
2 months ago
parent
2a719a45b4
commit
aa595b0cfa
13 changed files with 366 additions and 16 deletions
@ -0,0 +1,57 @@ |
||||
package org.springblade.desk.produce.pojo.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* 生产监控零件信息 视图实体类 |
||||
* |
||||
* @author litao |
||||
* @since 2026-2-27 |
||||
*/ |
||||
@Data |
||||
public class ProduceMonitorDsPartVO { |
||||
|
||||
@Schema(description = "零件名称") |
||||
private String partName; |
||||
|
||||
@Schema(description = "产品型号") |
||||
private String productType; |
||||
|
||||
@Schema(description = "硬度") |
||||
private String hardness; |
||||
|
||||
@Schema(description = "镀种") |
||||
private String plate; |
||||
|
||||
@Schema(description = "面积") |
||||
private Double area; |
||||
|
||||
@Schema(description = "材料") |
||||
private String material; |
||||
|
||||
@Schema(description = "标记要求") |
||||
private String signMemo; |
||||
|
||||
@Schema(description = "关键信息") |
||||
private String keyInfo; |
||||
|
||||
@Schema(description = "工艺路线") |
||||
private String craftWay; |
||||
|
||||
@Schema(description = "涂色标个数") |
||||
private String tsbNum; |
||||
|
||||
@Schema(description = "涂色带个数") |
||||
private String tsdNum; |
||||
|
||||
@Schema(description = "涂箭头个数") |
||||
private String tjtNum; |
||||
|
||||
@Schema(description = "产品系列") |
||||
private String productSeries; |
||||
|
||||
@Schema(description = "是否印字：1、否，2、单，3、双") |
||||
private String isPrint; |
||||
|
||||
} |
||||
@ -0,0 +1,94 @@ |
||||
package org.springblade.desk.produce.pojo.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
import org.springblade.desk.dashboard.pojo.vo.DsPartVO; |
||||
|
||||
import java.util.Date; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 生产监控订单信息 视图实体类 |
||||
* |
||||
* @author litao |
||||
* @since 2026-2-27 |
||||
*/ |
||||
@Data |
||||
public class ProduceMonitorOrderDataVO { |
||||
|
||||
@Schema(description = "车间订单号") |
||||
private String woCode; |
||||
|
||||
@Schema(description = "订单编码") |
||||
private String orderCode; |
||||
|
||||
@Schema(description = "流程卡号") |
||||
private String cardNo; |
||||
|
||||
@Schema(description = "零件号") |
||||
private String partCode; |
||||
|
||||
@Schema(description = "批次号") |
||||
private String batchNo; |
||||
|
||||
@Schema(description = "订单数量") |
||||
private Double ypQty; |
||||
|
||||
@Schema(description = "状态") |
||||
private String curStatus; |
||||
|
||||
@Schema(description = "优先级") |
||||
private String priority; |
||||
|
||||
@Schema(description = "调度员") |
||||
private String dispatcher; |
||||
|
||||
@Schema(description = "订单下达时间") |
||||
private Date sendDownTime; |
||||
|
||||
@Schema(description = "生产数量") |
||||
private Double makeQty; |
||||
|
||||
@Schema(description = "计划完工时间") |
||||
private Date planEndDate; |
||||
|
||||
@Schema(description = "需求交期") |
||||
private Date demandDate; |
||||
|
||||
@Schema(description = "生产标识") |
||||
private String prodIdent; |
||||
|
||||
@Schema(description = "镀后入库时间") |
||||
private Date putStoreTime; |
||||
|
||||
@Schema(description = "试验数量") |
||||
private Double testQty; |
||||
|
||||
@Schema(description = "消耗数量") |
||||
private Double lossQty; |
||||
|
||||
@Schema(description = "报废数量") |
||||
private Double scrapQty; |
||||
|
||||
@Schema(description = "工作订单备注") |
||||
private String ypMemo; |
||||
|
||||
@Schema(description = "会议要求周期") |
||||
private String meetCycle; |
||||
|
||||
@Schema(description = "审理单号") |
||||
private String reworkCode; |
||||
|
||||
@Schema(description = "订单类型") |
||||
private Integer yieldType; |
||||
|
||||
@Schema(description = "返工单号(仅状态为19的车间订单在生产监控展示)") |
||||
private String qcReworkCode; |
||||
|
||||
@Schema(description = "零件信息") |
||||
private ProduceMonitorDsPartVO dsPart; |
||||
|
||||
@Schema(description = "工序集合") |
||||
private List<ProduceMonitorWorkPlanVO> planList; |
||||
|
||||
} |
||||
@ -0,0 +1,70 @@ |
||||
package org.springblade.desk.produce.pojo.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
import java.time.LocalDateTime; |
||||
|
||||
/** |
||||
* 生产监控工序信息 视图实体类 |
||||
* |
||||
* @author litao |
||||
* @since 2026-2-27 |
||||
*/ |
||||
@Data |
||||
public class ProduceMonitorWorkPlanVO { |
||||
|
||||
@Schema(description = "工序id") |
||||
private Long id; |
||||
|
||||
@Schema(description = "工艺号") |
||||
private String orders; |
||||
|
||||
@Schema(description = "工序名称") |
||||
private String ppsName; |
||||
|
||||
@Schema(description = "状态") |
||||
private Integer status; |
||||
|
||||
@Schema(description = "是否主工序：0-否 1-是") |
||||
private String mainProcess; |
||||
|
||||
@Schema(description = "加工班组") |
||||
private String makeTeam; |
||||
|
||||
@Schema(description = "接收人ID") |
||||
private Long receiveMan; |
||||
|
||||
@Schema(description = "接收人") |
||||
private String receiveManName; |
||||
|
||||
@Schema(description = "计划加工人") |
||||
private String planWorkMan; |
||||
|
||||
@Schema(description = "报工人ID") |
||||
private Long workMan; |
||||
|
||||
@Schema(description = "报工人") |
||||
private String workManName; |
||||
|
||||
@Schema(description = "报工数量") |
||||
private Double workQty; |
||||
|
||||
@Schema(description = "额定工时") |
||||
private Double hourQuota; |
||||
|
||||
@Schema(description = "实际工时") |
||||
private Long hourActual; |
||||
|
||||
@Schema(description = "计划开始时间") |
||||
private LocalDateTime planStartTime; |
||||
|
||||
@Schema(description = "计划结束时间") |
||||
private LocalDateTime planEndTime; |
||||
|
||||
@Schema(description = "实际开始时间") |
||||
private LocalDateTime factStartTime; |
||||
|
||||
@Schema(description = "实际结束时间") |
||||
private LocalDateTime factEndTime; |
||||
} |
||||
@ -0,0 +1,39 @@ |
||||
package org.springblade.desk.produce.controller; |
||||
|
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.desk.produce.pojo.vo.ProduceMonitorOrderDataVO; |
||||
import org.springblade.desk.produce.service.IWorkOrderService; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
/** |
||||
* 生产监控 |
||||
* @author litao |
||||
*/ |
||||
@RestController |
||||
@RequiredArgsConstructor |
||||
@RequestMapping("/workOrder") |
||||
@Tag(name = "生产监控", description = "接口") |
||||
public class ProduceMonitorController extends BladeController { |
||||
|
||||
private final IWorkOrderService workOrderService; |
||||
|
||||
@GetMapping("/getOrderDetail") |
||||
@ApiOperationSupport(order = 1) |
||||
@Operation(summary = "获取订单详情：订单基础信息、零件信息、工序列表信息", description = "") |
||||
public R<ProduceMonitorOrderDataVO> getOrderDetail(@RequestParam Long woId, @RequestParam String partCode) { |
||||
return R.data(workOrderService.getOrderDetail(woId, partCode)); |
||||
} |
||||
|
||||
@GetMapping("/getPlanDetail") |
||||
@ApiOperationSupport(order = 2) |
||||
@Operation(summary = "获取工序详情", description = "") |
||||
public R getPlanDetail(@RequestParam Long wpId) { |
||||
return R.data(null); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue