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 74b267bc..6f975cd1 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 @@ -497,6 +497,15 @@ public class YieldOrder extends BaseEntity { @TableField(value = "parent_yo_id") private Long parentYoId; + @Schema(description = "涂色标个数") + private String tsbNum; + @Schema(description = "涂色带个数") + private String tsdNum; + @Schema(description = "涂箭头个数") + private String tjtNum; + @Schema(description = "责任部门") + private String resDept; + @JsonSerialize(nullsUsing = NullSerializer.class) private Double plateThickness1; diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java index 9a8e70d9..32e1cea1 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java @@ -369,4 +369,13 @@ public class YieldOrderEntity extends TenantEntity { @TableField(value = "ACTUAL_WEIGHING") private BigDecimal actualWeighing; + @Schema(description = "涂色标个数") + private String tsbNum; + @Schema(description = "涂色带个数") + private String tsdNum; + @Schema(description = "涂箭头个数") + private String tjtNum; + @Schema(description = "责任部门") + private String resDept; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java index 73dd228d..8812aa68 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java @@ -563,6 +563,8 @@ public class PdaSaveServiceImpl extends BaseServiceImpl users = userClient.listByNameNolike(rr.getRecman()); yieldOrder.setReceiveUser(CollectionUtils.isNotEmpty(users) ? users.get(0).getId() : AuthUtil.getUserId()); yieldOrder.setReceiveTime(new Date()); diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml index 060be2cb..249f95ee 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml @@ -105,18 +105,18 @@