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

bug修复

This commit is contained in:
大米 2024-07-18 18:20:49 +08:00
parent bb6e4daec0
commit f61c426a13
2 changed files with 2 additions and 1 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/EBom/EBomToPBomFor31.java
View File

@ -68,7 +68,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
data1010.add(parent);
for (BomNewEbomParentVO data : deliveryPackage1010) {
List<BomNewEbomParentVO> subVos = new ArrayList<>();
if (data.getMaterialName().contains("仙桃")) { //只获取下降虚拟包
if (data.getMaterialName().contains("仙桃") && !VirtualPackageTypeEnum.PAINT_PACKAGE.equalsValue(data.getVirtualPartType())) { //只获取下降虚拟包(排除仙桃油漆包)
subVos.add(data);
subVos.addAll(result.stream().filter(u -> u.getParentRowId().equals(data.getBomRowId())).collect(Collectors.toList()));
} else {

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

@ -533,6 +533,7 @@
AND (root_is = 1 OR user_root_is = 1)
AND sap_state > 3
AND created_by = #{userCode}
<include refid="whr"/>
ORDER BY release_time DESC
</select>
<select id="getSapErrorNum" resultType="java.lang.Integer">