diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/AllWorkPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/AllWorkPlanVO.java index 86b88809..93da9215 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/AllWorkPlanVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/AllWorkPlanVO.java @@ -31,6 +31,9 @@ public class AllWorkPlanVO { @Schema(description = "工序号") private String orders; + @Schema(description = "状态") + private Integer status; + @Schema(description = "提交备注") private String memo; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index c74743d0..7198f9c4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -563,7 +563,8 @@ b.BATCH_NO AS batchNo, a.ID AS wpId, a.orders AS orders, - c.NAME AS ppsName + c.NAME AS ppsName, + a.STATUS AS status FROM mes_work_plan a INNER JOIN mes_work_order b ON a.WO_ID = b.ID