修复

whycxzp

2022-09-07 fc19278b9ec34d1a0771da5c3b7d92d7cf6d90f7

修复

 src/main/java/com/whyc/pojo/MaterialProductApproving.java

@@ -18,8 +18,8 @@
    private String parentCode;
    @ApiModelProperty("定制表单号")
    private String customCode;
    @ApiModelProperty("子件编码")
    private String subCode;
    @ApiModelProperty("子件物料id")
    private int subMaterialId;
    @ApiModelProperty("子件数量")
    private Integer quantity;
    @ApiModelProperty("关联类型:-1(移除),1(关联)")
@@ -64,12 +64,12 @@
        this.customCode = customCode;
    }

    public String getSubCode() {
        return subCode;
    public int getSubMaterialId() {
        return subMaterialId;
    }

    public void setSubCode(String subCode) {
        this.subCode = subCode;
    public void setSubMaterialId(int subMaterialId) {
        this.subMaterialId = subMaterialId;
    }

    public Integer getMainId() {

 src/main/java/com/whyc/service/WorksheetLinkService.java

@@ -516,7 +516,7 @@
                            his.setCustomCode(approving.getCustomCode());
                            his.setSVersion(approving.getVersion());
                            his.setEVersion(approving.getVersion());
                            his.setSubCode(approving.getSubCode());
                            his.setSubMaterialId(approving.getSubMaterialId());
                            his.setQuantity(approving.getQuantity());
                            his.setMaterialId(approving.getMaterialId());
                            his.setCreateTime(new Date());