src/main/java/com/whyc/pojo/ProductBom.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/ProductBomApproving.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/ProductBomHistory.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/ProductBomService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetLinkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetMainService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/pojo/ProductBom.java
@@ -52,7 +52,7 @@ private String pictureUrl; private String fileUrl; @ApiModelProperty("上传人") private String upUser; private Long upUserId; private Date createDate; private Date updateDate; @ApiModelProperty("版本") @@ -207,12 +207,12 @@ this.fileUrl = fileUrl; } public String getUpUser() { return upUser; public Long getUpUserId() { return upUserId; } public void setUpUser(String upUser) { this.upUser = upUser; public void setUpUserId(Long upUserId) { this.upUserId = upUserId; } public Date getCreateDate() { src/main/java/com/whyc/pojo/ProductBomApproving.java
@@ -50,7 +50,7 @@ private String pictureUrl; private String fileUrl; @ApiModelProperty("上传人") private String upUser; private Long upUserId; private Date createDate; private Date updateDate; @ApiModelProperty("版本") @@ -211,12 +211,12 @@ this.fileUrl = fileUrl; } public String getUpUser() { return upUser; public Long getUpUserId() { return upUserId; } public void setUpUser(String upUser) { this.upUser = upUser; public void setUpUserId(Long upUserId) { this.upUserId = upUserId; } public Date getCreateDate() { src/main/java/com/whyc/pojo/ProductBomHistory.java
@@ -48,7 +48,7 @@ private String pictureUrl; private String fileUrl; @ApiModelProperty("上传人") private String upUser; private Long upUserId; private Date createDate; //private Date updateDate; @ApiModelProperty("起始版本号") @@ -205,12 +205,12 @@ this.fileUrl = fileUrl; } public String getUpUser() { return upUser; public Long getUpUserId() { return upUserId; } public void setUpUser(String upUser) { this.upUser = upUser; public void setUpUserId(Long upUserId) { this.upUserId = upUserId; } public Date getCreateDate() { src/main/java/com/whyc/service/ProductBomService.java
@@ -134,7 +134,7 @@ newBom.setThickness(newBomHis.getThickness()); newBom.setType(newBomHis.getType()); newBom.setUnit(newBomHis.getUnit()); newBom.setUpUser(newBomHis.getUpUser()); newBom.setUpUserId(newBomHis.getUpUserId()); newBom.setVersion(newBomHis.getEVersion()); newBomList.add(newBom); src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -151,7 +151,7 @@ his.setThickness(approvingBom.getThickness()); his.setType(approvingBom.getType()); his.setUnit(approvingBom.getUnit()); his.setUpUser(approvingBom.getUpUser()); his.setUpUserId(approvingBom.getUpUserId()); newHistoryList.add(his); }); src/main/java/com/whyc/service/WorksheetMainService.java
@@ -100,6 +100,7 @@ int nextRejectVersion = rejectVersion+1; bomList.forEach(bom->{ bom.setMainId(main.getId()); bom.setUpUserId(user.getId()); bom.setRejectVersion(nextRejectVersion); }); approvingService.insert(bomList);