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

问题修复

This commit is contained in:
luoliming 2023-12-06 23:29:38 +08:00
parent 1b81a44e01
commit 5add5d4215
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,8 +155,8 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
child.setStatus(parentEntity.getStatus());
child.setDeviseName(parentEntity.getDeviseName());
child.setDeviseUserCode(parentEntity.getDeviseUserCode());
child.setCreatedBy(parentEntity.getCreatedBy());
child.setCreatedTime(parentEntity.getCreatedTime());
// child.setCreatedBy(parentEntity.getCreatedBy());
// child.setCreatedTime(parentEntity.getCreatedTime());
child.setBomRowId(parentEntity.getRowId());
child.setLevelNum(parentEntity.getLevelNum());
child.setDeptName(parentEntity.getDeptName());

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

@ -125,7 +125,7 @@ public abstract class BaseConvert {
parentEntity.setDeptName(SessionUtil.getDepartName());
parentEntity.setSource(originalSourceEnum.getValue());
parentEntity.setCreatedBy(material.getCreatedBy());
parentEntity.setCreatedBy(SessionUtil.getUserCode());
parentEntity.setCreatedTime(LocalDateTime.now());
if (StrUtil.isNotBlank(material.getMaterialCategoryCode()) &&(material.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) || material.getMaterialCategoryCode().startsWith("30") ||
@ -152,7 +152,7 @@ public abstract class BaseConvert {
childEntity.setMaterialDesc(material.getMaterialDesc());
childEntity.setUnitWeight(material.getWeight());
childEntity.setNum(Convert.toBigDecimal(material.getQty()) );
childEntity.setCreatedBy(parent.getCreatedBy());
childEntity.setCreatedBy(SessionUtil.getUserCode());
this.resultChild.add(childEntity);
return childEntity;
@ -175,7 +175,7 @@ public abstract class BaseConvert {
childEntity.setMaterialDesc(material.getMaterialDesc());
childEntity.setUnitWeight(parent.getUnitWeight());
childEntity.setNum(parent.getUnitWeight());
childEntity.setCreatedBy(SessionUtil.getUserCode());
this.resultChild.add(childEntity);
return childEntity;

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

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