diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index 1eaa1d2a..74b267bc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -109,6 +109,16 @@ public class YieldOrder extends BaseEntity { */ public static Short SJ_KIT_PREPARATION_2 = 2; + /** + * 玻璃饼下发状态 未下发 + */ + public static Integer GLASS_BISCUIT_NOT_ISSUED = 0; + + /** + * 玻璃饼下发状态 已下发 + */ + public static Integer GLASS_BISCUIT_ISSUED = 1; + /** * 作业中心 */ @@ -475,6 +485,18 @@ public class YieldOrder extends BaseEntity { @TableField(value = "plan_deptcode") private String planDeptCode; + /** + * 玻璃饼下发状态 + */ + @TableField(value = "glass_biscuit_status") + private Integer glassBiscuitStatus; + + /** + * parentId 标记父订单 + */ + @TableField(value = "parent_yo_id") + private Long parentYoId; + @JsonSerialize(nullsUsing = NullSerializer.class) private Double plateThickness1; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index d1e10afe..476c209f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -245,6 +245,15 @@ public class YieldOrderServiceImpl extends BaseServiceImpl