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

原始BOM列表

This commit is contained in:
大米 2023-12-01 18:56:28 +08:00
parent 102a58d069
commit e4e733d61f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ public abstract class BaseConvert {
parentEntity.setMaterialTexture(material.getMaterial()); parentEntity.setMaterialTexture(material.getMaterial());
parentEntity.setUnitWeight(material.getWeight()); parentEntity.setUnitWeight(material.getWeight());
parentEntity.setDeviseUserCode(material.getDesignBy()); parentEntity.setDeviseUserCode(material.getDesignBy());
parentEntity.setDeviseName(SessionUtil.getUserName()); parentEntity.setDeviseName(SessionUtil.getRealName());
parentEntity.setStatus(OriginalStatusEnum.UN_CONVERT.getValue()); parentEntity.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue()); parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue());
parentEntity.setDeptRowId(SessionUtil.getPartRowId()); parentEntity.setDeptRowId(SessionUtil.getPartRowId());

2
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
View File

@ -61,7 +61,7 @@
</foreach> </foreach>
</if> </if>
<if test="query.startDate!=null and query.startDate!=''"> <if test="query.startDate!=null and query.startDate!=''">
and created_time between #{query.startDate} and #{query.startDate} and created_time between #{query.startDate} and #{query.endDate}
</if> </if>
</sql> </sql>