rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

变更通知单

This commit is contained in:
10001392 2024-08-02 17:50:16 +08:00
parent fd94ef194b
commit 422a388d0e
3 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewNoticeNumDetail2Entity.java
View File

@ -43,6 +43,13 @@ public class BomNewNoticeNumDetail2Entity implements Serializable {
@ApiModelProperty(value = "父级编码")
private String parentMaterialNo;
/**
* 父级描述
*/
@TableField(value = "parent_material_desc")
@ApiModelProperty(value = "父级描述")
private String parentMaterialDesc;
/**
* BOM行编号
*/
@ -58,6 +65,13 @@ public class BomNewNoticeNumDetail2Entity implements Serializable {
@ApiModelProperty(value = "物料编码")
private String materialNo;
/**
* 物料描述
*/
@TableField(value = "material_desc")
@ApiModelProperty(value = "物料描述")
private String materialDesc;
/**
* 变更内容 1=BOM物料增加 2=BOM物料减少 3=BOM物料替换 4=BOM物料数量变更 5=BOM项目类别变更
*/

23
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -3093,8 +3093,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(newestParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(newestParent.getMaterialDesc());
saveDetail2.setOrderNum(addEntity.getOrderNumber());
saveDetail2.setMaterialNo(addEntity.getMaterialNo());
saveDetail2.setMaterialDesc(addEntity.getMaterialDesc());
saveDetail2.setChangeType(1);
saveDetail2.setChangeContent("BOM物料增加");
noticeNumDetailEntity2List.add(saveDetail2);
@ -3120,8 +3122,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(lastParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(lastParent.getMaterialDesc());
saveDetail2.setOrderNum(removeEntity.getOrderNumber());
saveDetail2.setMaterialNo(removeEntity.getMaterialNo());
saveDetail2.setMaterialDesc(removeEntity.getMaterialDesc());
saveDetail2.setChangeType(2);
saveDetail2.setChangeContent("BOM物料减少");
noticeNumDetailEntity2List.add(saveDetail2);
@ -3151,8 +3155,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(newestParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(newestParent.getMaterialDesc());
saveDetail2.setOrderNum(replaceEntity.getOrderNumber());
saveDetail2.setMaterialNo(replaceEntity.getMaterialNo());
saveDetail2.setMaterialDesc(replaceEntity.getMaterialDesc());
saveDetail2.setChangeType(3);
saveDetail2.setChangeContent("BOM物料替换");
noticeNumDetailEntity2List.add(saveDetail2);
@ -3182,8 +3188,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(newestParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(newestParent.getMaterialDesc());
saveDetail2.setOrderNum(newestChild.getOrderNumber());
saveDetail2.setMaterialNo(newestChild.getMaterialNo());
saveDetail2.setMaterialDesc(newestChild.getMaterialDesc());
saveDetail2.setChangeType(4);
saveDetail2.setChangeContent("BOM物料数量变更:" + lastChild.getNum() + "->" + newestChild.getNum());
noticeNumDetailEntity2List.add(saveDetail2);
@ -3206,14 +3214,25 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(newestParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(newestParent.getMaterialDesc());
saveDetail2.setOrderNum(newestChild.getOrderNumber());
saveDetail2.setMaterialNo(newestChild.getMaterialNo());
saveDetail2.setMaterialDesc(newestChild.getMaterialDesc());
saveDetail2.setChangeType(5);
saveDetail2.setChangeContent("BOM项目类别变更:" + lastChild.getProjectType() + "->" + newestChild.getProjectType());
noticeNumDetailEntity2List.add(saveDetail2);
}
BomNewEbomParentFormalEntity newestP = bomNewEbomParentFormalService.lambdaQuery().eq(BomNewEbomParentFormalEntity::getRowId, newestChild.getBomVersionRowId()).one();
BomNewEbomParentFormalEntity lastP = bomNewEbomParentFormalService.lambdaQuery().eq(BomNewEbomParentFormalEntity::getRowId, lastChild.getBomVersionRowId()).one();
}
// 有下级的
List<BomNewEbomParentEntity> parentList = this.lambdaQuery().in(BomNewEbomParentEntity::getMaterialNo, intersection).list();
for (BomNewEbomParentEntity parent: parentList) {
List<BomNewEbomParentFormalEntity> versionList = bomNewEbomParentFormalService.lambdaQuery().eq(BomNewEbomParentFormalEntity::getMaterialNo, parent.getMaterialNo()).orderByDesc(BomNewEbomParentFormalEntity::getRowId).list();
// 只有一个版本，说明没变更，跳过
if (versionList.size() == 1) {
continue;
}
BomNewEbomParentFormalEntity newestP = versionList.get(0); // 最新版
BomNewEbomParentFormalEntity lastP = versionList.get(1); // 上一版本
buildNoticeNumDetailList(noticeNumRowId, noticeNumDetailEntityList, noticeNumDetailEntity2List, newestP, lastP);
}
}

23
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
View File

@ -1656,8 +1656,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(newestParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(newestParent.getMaterialDesc());
saveDetail2.setOrderNum(addEntity.getOrderNumber());
saveDetail2.setMaterialNo(addEntity.getMaterialNo());
saveDetail2.setMaterialDesc(addEntity.getMaterialDesc());
saveDetail2.setChangeType(1);
saveDetail2.setChangeContent("BOM物料增加");
noticeNumDetailEntity2List.add(saveDetail2);
@ -1683,8 +1685,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(lastParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(lastParent.getMaterialDesc());
saveDetail2.setOrderNum(removeEntity.getOrderNumber());
saveDetail2.setMaterialNo(removeEntity.getMaterialNo());
saveDetail2.setMaterialDesc(removeEntity.getMaterialDesc());
saveDetail2.setChangeType(2);
saveDetail2.setChangeContent("BOM物料减少");
noticeNumDetailEntity2List.add(saveDetail2);
@ -1714,8 +1718,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(newestParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(newestParent.getMaterialDesc());
saveDetail2.setOrderNum(replaceEntity.getOrderNumber());
saveDetail2.setMaterialNo(replaceEntity.getMaterialNo());
saveDetail2.setMaterialDesc(replaceEntity.getMaterialDesc());
saveDetail2.setChangeType(3);
saveDetail2.setChangeContent("BOM物料替换");
noticeNumDetailEntity2List.add(saveDetail2);
@ -1745,8 +1751,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(newestParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(newestParent.getMaterialDesc());
saveDetail2.setOrderNum(newestChild.getOrderNumber());
saveDetail2.setMaterialNo(newestChild.getMaterialNo());
saveDetail2.setMaterialDesc(newestChild.getMaterialDesc());
saveDetail2.setChangeType(4);
saveDetail2.setChangeContent("BOM物料数量变更:" + lastChild.getNum() + "->" + newestChild.getNum());
noticeNumDetailEntity2List.add(saveDetail2);
@ -1769,14 +1777,25 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
saveDetail2.setRowId(IdWorker.getId());
saveDetail2.setHeaderRowId(noticeNumRowId);
saveDetail2.setParentMaterialNo(newestParent.getMaterialNo());
saveDetail2.setParentMaterialDesc(newestParent.getMaterialDesc());
saveDetail2.setOrderNum(newestChild.getOrderNumber());
saveDetail2.setMaterialNo(newestChild.getMaterialNo());
saveDetail2.setMaterialDesc(newestChild.getMaterialDesc());
saveDetail2.setChangeType(5);
saveDetail2.setChangeContent("BOM项目类别变更:" + lastChild.getProjectType() + "->" + newestChild.getProjectType());
noticeNumDetailEntity2List.add(saveDetail2);
}
BomNewPbomParentFormalEntity newestP = bomNewPbomParentFormalService.lambdaQuery().eq(BomNewPbomParentFormalEntity::getRowId, newestChild.getBomVersionRowId()).one();
BomNewPbomParentFormalEntity lastP = bomNewPbomParentFormalService.lambdaQuery().eq(BomNewPbomParentFormalEntity::getRowId, lastChild.getBomVersionRowId()).one();
}
// 有下级的
List<BomNewPbomParentEntity> parentList = this.lambdaQuery().in(BomNewPbomParentEntity::getMaterialNo, intersection).list();
for (BomNewPbomParentEntity parent: parentList) {
List<BomNewPbomParentFormalEntity> versionList = bomNewPbomParentFormalService.lambdaQuery().eq(BomNewPbomParentFormalEntity::getMaterialNo, parent.getMaterialNo()).orderByDesc(BomNewPbomParentFormalEntity::getRowId).list();
// 只有一个版本，说明没变更，跳过
if (versionList.size() == 1) {
continue;
}
BomNewPbomParentFormalEntity newestP = versionList.get(0); // 最新版
BomNewPbomParentFormalEntity lastP = versionList.get(1); // 上一版本
buildNoticeNumDetailList(noticeNumRowId, noticeNumDetailEntityList, noticeNumDetailEntity2List, newestP, lastP);
}
}