whycxzp
2022-08-15 4474fad95f5858bf3d4b57b24943dc65bd75715c
更新审批
3个文件已修改
21 ■■■■■ 已修改文件
src/main/java/com/whyc/pojo/ComponentProductApproving.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/ComponentProductHistory.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/WorksheetLinkService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/ComponentProductApproving.java
@@ -16,6 +16,8 @@
    private String parentModel;
    @ApiModelProperty("子件名称")
    private String subName;
    @ApiModelProperty("子件数量")
    private Integer quantity;
    @ApiModelProperty("关联类型:-1(移除),1(关联),2(替换)")
    private Integer linkType;
    @ApiModelProperty("主表id")
@@ -79,4 +81,12 @@
    public void setComponent(Component component) {
        this.component = component;
    }
    public Integer getQuantity() {
        return quantity;
    }
    public void setQuantity(Integer quantity) {
        this.quantity = quantity;
    }
}
src/main/java/com/whyc/pojo/ComponentProductHistory.java
@@ -17,6 +17,8 @@
    private String parentModel;
    @ApiModelProperty("子件名称")
    private String subName;
    @ApiModelProperty("子件数量")
    private Integer quantity;
    private Date createTime;
    @ApiModelProperty("关联类型:1(关联),2(替换)")
    private Integer linkType;
@@ -87,4 +89,11 @@
        this.linkType = linkType;
    }
    public Integer getQuantity() {
        return quantity;
    }
    public void setQuantity(Integer quantity) {
        this.quantity = quantity;
    }
}
src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -362,6 +362,7 @@
                        newHistory.setComponentId(replace.getComponentId());
                        newHistory.setParentModel(replace.getParentModel());
                        newHistory.setSubName(replace.getSubName());
                        newHistory.setQuantity(replace.getQuantity());
                        newHistory.setCreateTime(new Date());
                        newHistory.setLinkType(2);
                        newHistory.setSVersion(nextVersion);
@@ -407,6 +408,7 @@
                    newHistory.setComponentId(add.getComponentId());
                    newHistory.setParentModel(add.getParentModel());
                    newHistory.setSubName(add.getSubName());
                    newHistory.setQuantity(add.getQuantity());
                    newHistory.setCreateTime(new Date());
                    newHistory.setLinkType(1);
                    newHistory.setSVersion(nextVersion);