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

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

This commit is contained in:
曹鹏飞 2024-04-29 11:35:42 +08:00
parent 8a68c880b8 be9702a415
commit 39f16244ca
8 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java
View File

@ -38,6 +38,7 @@ public class TestApi {
sapDto.setZID(RandomUtil.randomNumbers(5)); sapDto.setZID(RandomUtil.randomNumbers(5));
sapDto.setI_WERKS("1"); sapDto.setI_WERKS("1");
sapDto.setI_STLAN("1"); sapDto.setI_STLAN("1");
sapDto.setI_EMPNO("测试者");
List<T1DTO> t1s = new ArrayList<>(); List<T1DTO> t1s = new ArrayList<>();
T1DTO t1 = new T1DTO(); T1DTO t1 = new T1DTO();
t1.setID(RandomUtil.randomNumbers(5)); t1.setID(RandomUtil.randomNumbers(5));

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/ImportSapParam2DTO.java
View File

@ -4,8 +4,6 @@ package com.nflg.product.bomnew.pojo.dto.sap.impart2;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* *
*/ */
@ -26,5 +24,7 @@ public class ImportSapParam2DTO {
@ApiModelProperty(" EBOM: 2;PBOM: P;MBOM: 1;移动破: 1") @ApiModelProperty(" EBOM: 2;PBOM: P;MBOM: 1;移动破: 1")
private String I_STLAN; private String I_STLAN;
//创建者
@ApiModelProperty("创建者")
private String I_EMPNO;
} }

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/ImportSapParamDTO.java
View File

@ -26,6 +26,9 @@ public class ImportSapParamDTO {
@ApiModelProperty(" EBOM: 2;PBOM: P;MBOM: 1;移动破: 1") @ApiModelProperty(" EBOM: 2;PBOM: P;MBOM: 1;移动破: 1")
private String I_STLAN; private String I_STLAN;
//创建者
@ApiModelProperty("创建者")
private String I_EMPNO;
@ApiModelProperty("详情") @ApiModelProperty("详情")
private List<T1DTO> T1; private List<T1DTO> T1;

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

@ -937,6 +937,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
sapDto.setZID(RandomUtil.randomNumbers(5)); sapDto.setZID(RandomUtil.randomNumbers(5));
sapDto.setI_WERKS("1"); sapDto.setI_WERKS("1");
sapDto.setI_STLAN("2"); sapDto.setI_STLAN("2");
sapDto.setI_EMPNO(root.getCreatedBy());
List<T1DTO> t1s = new ArrayList<>(); List<T1DTO> t1s = new ArrayList<>();
buildChildrenForSap(root, t1s); buildChildrenForSap(root, t1s);
sapDto.setT1(t1s); sapDto.setT1(t1s);

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

@ -271,6 +271,7 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
} }
result.setI_STLAN(BomConstant.SAP_MBOM); result.setI_STLAN(BomConstant.SAP_MBOM);
result.setI_EMPNO(parentVO.getCreatedBy());
String dateYMD= DateUtil.format(new Date(),"yyyyMMdd"); String dateYMD= DateUtil.format(new Date(),"yyyyMMdd");
List<BomNewMbomMiddleVO> parentList=list.stream().filter(u -> u.getBomExist().intValue()>0).collect(Collectors.toList()); List<BomNewMbomMiddleVO> parentList=list.stream().filter(u -> u.getBomExist().intValue()>0).collect(Collectors.toList());

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

@ -1108,6 +1108,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
sapDto.setZID(RandomUtil.randomNumbers(5)); sapDto.setZID(RandomUtil.randomNumbers(5));
sapDto.setI_WERKS("1"); sapDto.setI_WERKS("1");
sapDto.setI_STLAN("1"); sapDto.setI_STLAN("1");
sapDto.setI_EMPNO(root.getCreatedBy());
List<T1DTO> t1s = new ArrayList<>(); List<T1DTO> t1s = new ArrayList<>();
buildChildrenForSap(root, t1s); buildChildrenForSap(root, t1s);
sapDto.setT1(t1s); sapDto.setT1(t1s);

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

@ -403,6 +403,7 @@ public class DQBomService {
sapDto.setZID(RandomUtil.randomNumbers(5)); sapDto.setZID(RandomUtil.randomNumbers(5));
sapDto.setI_WERKS("1"); sapDto.setI_WERKS("1");
sapDto.setI_STLAN("1"); sapDto.setI_STLAN("1");
sapDto.setI_EMPNO(root.getCreatedBy());
List<T1DTO> t1s = new ArrayList<>(); List<T1DTO> t1s = new ArrayList<>();
String dateYMD = DateUtil.format(new Date(), "yyyyMMdd"); String dateYMD = DateUtil.format(new Date(), "yyyyMMdd");
datas.forEach(d -> { datas.forEach(d -> {

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

@ -132,7 +132,8 @@ public class OptionalMbomMaterialService extends ServiceImpl<OptionalMbomMateria
// //
result.setZID(RandomUtil.randomNumbers(5)); result.setZID(RandomUtil.randomNumbers(5));
result.setI_WERKS("1"); result.setI_WERKS("1");
result.setI_STLAN(BomConstant.SAP_YDBOM); result.setI_STLAN(BomConstant.SAP_YDBOM);
result.setI_EMPNO(entity.getCreatedBy());
String dateYMD=DateUtil.format(new Date(),"yyyyMMdd"); String dateYMD=DateUtil.format(new Date(),"yyyyMMdd");
for (OptionalMbomMaterialListVO parent: for (OptionalMbomMaterialListVO parent: