diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java index fccfaba..ffc42b0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java @@ -14,6 +14,6 @@ public class SamplePriceDTO { @ApiModelProperty(value = "委托书-样品关联表id", dataType = "Long") private Long relationId; - @ApiModelProperty(value = "标价", dataType = "Integer") + @ApiModelProperty(value = "标价(单位分)", dataType = "Integer") private Integer price; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java index fccfaba..ffc42b0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java @@ -14,6 +14,6 @@ public class SamplePriceDTO { @ApiModelProperty(value = "委托书-样品关联表id", dataType = "Long") private Long relationId; - @ApiModelProperty(value = "标价", dataType = "Integer") + @ApiModelProperty(value = "标价(单位分)", dataType = "Integer") private Integer price; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index f4c9c29..19b348a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -154,4 +154,8 @@ @TableField(exist = false) @ApiModelProperty(value = "是否存在样品库(0-不存在,1-存在)", dataType = "String") private String isExistSample; + + @TableField(exist = false) + @ApiModelProperty(value = "委托书样品关联表id", dataType = "Long") + private Long relationId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java index fccfaba..ffc42b0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SamplePriceDTO.java @@ -14,6 +14,6 @@ public class SamplePriceDTO { @ApiModelProperty(value = "委托书-样品关联表id", dataType = "Long") private Long relationId; - @ApiModelProperty(value = "标价", dataType = "Integer") + @ApiModelProperty(value = "标价(单位分)", dataType = "Integer") private Integer price; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index f4c9c29..19b348a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -154,4 +154,8 @@ @TableField(exist = false) @ApiModelProperty(value = "是否存在样品库(0-不存在,1-存在)", dataType = "String") private String isExistSample; + + @TableField(exist = false) + @ApiModelProperty(value = "委托书样品关联表id", dataType = "Long") + private Long relationId; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 87bffe5..1308454 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -96,6 +96,7 @@ if (null != customerSampleInfo) { customerSampleInfo.setSampleStatus(orderSample.getSampleStatus()); customerSampleInfo.setIsExistSample("1"); + customerSampleInfo.setRelationId(orderSample.getId()); customerSampleList.add(customerSampleInfo); } }