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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-05-23 11:50:40 +08:00
parent fb62f92f05 a672698303
commit 383dda49f3
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
View File

@ -268,7 +268,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
} }
} }
buildEBomChild(childVo, parentEntity.getEBomRowId()); buildEBomChild(childVo, parentEntity);
} }
} }
@ -411,14 +411,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
} }
private void buildEBomChild(BomOriginalListVO child, Long parentRowId) { private void buildEBomChild(BomOriginalListVO child, BomOriginalListVO parent) {
BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity(); BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity();
BeanUtil.copyProperties(child, childEntity, "materialGetType"); BeanUtil.copyProperties(child, childEntity, "materialGetType");
childEntity.setRowId(IdWorker.getId()); childEntity.setRowId(IdWorker.getId());
childEntity.setParentRowId(parentRowId); childEntity.setParentRowId(parent.getEBomRowId());
childEntity.setIdentityNo(StrUtil.join("_", parentRowId.toString(), childEntity.getRowId())); childEntity.setIdentityNo(StrUtil.join("_", parent.getEBomRowId().toString(), childEntity.getRowId()));
childEntity.setModifyTime(LocalDateTime.now()); childEntity.setModifyTime(LocalDateTime.now());
childEntity.setSourceRowId(StrUtil.isNotBlank(child.getSourceRowId())?child.getSourceRowId(): child.getRowId().toString()); childEntity.setSourceRowId(StrUtil.isNotBlank(child.getSourceRowId())?child.getSourceRowId(): child.getRowId().toString());
//当为原材料时，数量=总重 单位改为KG 图号=编码 //当为原材料时，数量=总重 单位改为KG 图号=编码
@ -428,6 +428,9 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
// childEntity.setDrawingNo(childEntity.getMaterialNo()); // childEntity.setDrawingNo(childEntity.getMaterialNo());
// } // }
childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit()); childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit());
if (parent.getMaterialNo().startsWith("31")) {
childEntity.setVirtualPartRootMaterialNo(parent.getMaterialNo());
}
this.eBomChildResult.add(childEntity); this.eBomChildResult.add(childEntity);

3
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
View File

@ -403,7 +403,8 @@
created_by=#{userCode} created_by=#{userCode}
</if> </if>
<if test="userJob==1 and query.dataType==0"> <if test="userJob==1 and query.dataType==0">
AND (root_is=1 OR user_root_is=1) AND status=2 AND ((root_is=1 OR user_root_is=1) AND status=2) OR (status IN (1,3) AND (root_is=1 OR user_root_is=1 OR
root_is_for_wait_review=1) AND created_by=#{userCode})
</if> </if>
<if test="userJob==1 and query.dataType==1"> <if test="userJob==1 and query.dataType==1">
AND (root_is=1 OR user_root_is=1) AND status=4 AND (root_is=1 OR user_root_is=1) AND status=4

14
nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java
View File

@ -20,22 +20,30 @@ public class MybatisPlusHandler implements MetaObjectHandler {
public void insertFill(MetaObject metaObject) { public void insertFill(MetaObject metaObject) {
this.strictInsertFill(metaObject, "createdBy", String.class, getUserName()); this.strictInsertFill(metaObject, "createdBy", String.class, getUserName());
this.strictInsertFill(metaObject, "createdTime", LocalDateTime.class, LocalDateTime.now()); this.strictInsertFill(metaObject, "createdTime", LocalDateTime.class, LocalDateTime.now());
this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName()); this.strictInsertFill(metaObject, "updatedBy", String.class, getRealName());
this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now()); this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now());
} }
@Override @Override
public void updateFill(MetaObject metaObject) { public void updateFill(MetaObject metaObject) {
this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName()); this.strictInsertFill(metaObject, "updatedBy", String.class, getRealName());
this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now()); this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now());
} }
private String getUserName() { private String getRealName() {
try { try {
return StrUtil.isNotBlank(SessionUtil.getRealName()) ? SessionUtil.getRealName() : SessionUtil.getUserName(); return StrUtil.isNotBlank(SessionUtil.getRealName()) ? SessionUtil.getRealName() : SessionUtil.getUserName();
} catch (NflgBusinessException e) { } catch (NflgBusinessException e) {
return "admin"; return "admin";
} }
} }
private String getUserName() {
try {
return SessionUtil.getUserName();
} catch (NflgBusinessException e) {
return "admin";
}
}
} }