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

移动破修改

This commit is contained in:
jing's 2023-12-11 21:39:32 +08:00
parent 25df92278a
commit 2166a0a33f
5 changed files with 5 additions and 5 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/OptionalEbomImportChildService.java
View File

@ -138,7 +138,7 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
bizErr=item.getMaterialName(); bizErr=item.getMaterialName();
} }
throw new NflgBusinessException(STATE.BusinessError, "存在相同的数据, "+bizErr); throw new NflgBusinessException(STATE.BusinessError, "存在相同物料, "+bizErr);
} }

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

@ -43,7 +43,7 @@
<if test="query.startDate!= null and query.startDate!= '' and query.endDate != null and query.endDate!= '' "> <if test="query.startDate!= null and query.startDate!= '' and query.endDate != null and query.endDate!= '' ">
<![CDATA[and created_time >= #{query.startDate} and created_time < #{query.endDate} ]]> <![CDATA[and created_time >= #{query.startDate} and created_time <= #{query.endDate} ]]>
</if> </if>

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

@ -56,7 +56,7 @@ row_id,parent_row_id,root_row_id,material_no,material_name,material_desc,drawing
<if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != ''"> <if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != ''">
<![CDATA[ and created_time >= #{query.startDate} and created_time < #{query.endDate}]]> <![CDATA[ and created_time >= #{query.startDate} and created_time <= #{query.endDate}]]>
</if> </if>

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

@ -41,7 +41,7 @@
</if> </if>
<if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != ''"> <if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != ''">
<![CDATA[ and created_time >= #{query.startDate} and created_time < #{query.endDate}]]> <![CDATA[ and created_time >= #{query.startDate} and created_time <= #{query.endDate}]]>
</if> </if>
<if test="query.realName != null and query.realName != ''"> <if test="query.realName != null and query.realName != ''">

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

@ -72,7 +72,7 @@ row_id,parent_row_id,level_row_id,material_no,material_name,material_desc,drawin
</if> </if>
<if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != null"> <if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != null">
<![CDATA[ and t1.created_time >= #{query.startDate} and t1.created_time < #{query.endDate}]]> <![CDATA[ and t1.created_time >= #{query.startDate} and t1.created_time <= #{query.endDate}]]>
</if> </if>