licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化过程检验记录生成，增加bomMxId字段

Browse Source
This commit is contained in:
think 2025-01-15 17:48:27 +08:00
parent c6e4cebad2
commit 21d4abdadb
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java
View File

@ -29,7 +29,7 @@ public interface ProcessBomMapper extends BaseMapperX<ProcessBomDO> {
default List<ProcessBomDO> selectBomMx(Long task_id,Long project_id) {
default List<ProcessBomDO> selectBomMx(Long task_id,Long project_id,Long bomId) {
MPJLambdaWrapper<ProcessBomDO> query = new MPJLambdaWrapper<>();
query.selectAll(ProcessBomDO.class)
.select("b.id as bomId,b.material_id as materialId,b.amount,b.type," +
@ -44,7 +44,7 @@ public interface ProcessBomMapper extends BaseMapperX<ProcessBomDO> {
.leftJoin(ProjectOrderSubDO.class,"d",ProjectOrderSubDO::getId,ProcessBomDO::getProjectSubId)
.leftJoin(PlanDO.class,"e",PlanDO::getId,ProcessBomDO::getPlanId)
.leftJoin(ProjectOrderDO.class,"f",ProjectOrderDO::getId,ProcessBomDO::getProjectId)
.eq(ProcessBomDetailDO::getId,bomId)
.eq(ProcessBomDO::getProjectId, project_id)
.eq(ProcessBomDO::getPlanId,task_id)

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java
View File

@ -79,7 +79,7 @@ public interface PgMasterService {
*/
List<PgMasterLineDO> getPgMasterLineListByZlPgId(Integer zlPgId);
Boolean insertPgList(Long task_id,Long project_id);
Boolean insertPgList(Long task_id,Long project_id,Long bomMxId);
List<PgMasterLineDO> searchBomMx(Long task_id,Long project_id);

7
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java
View File

@ -59,9 +59,9 @@ public class PgMasterServiceImpl implements PgMasterService {
@Override
public Boolean insertPgList(Long task_id,Long project_id){
public Boolean insertPgList(Long task_id,Long project_id,Long bomMxId){
//查询BOM明细
List<ProcessBomDO> processBomDOList = processBomMapper.selectBomMx(task_id,project_id);
List<ProcessBomDO> processBomDOList = processBomMapper.selectBomMx(task_id,project_id,bomMxId);
List<PgMasterLineDO> pgMasterLineDOList = new ArrayList<>();
processBomDOList.forEach( o ->{
PgMasterLineDO pgMasterLineDO = new PgMasterLineDO();
@ -125,8 +125,9 @@ public class PgMasterServiceImpl implements PgMasterService {
@Override
public List<PgMasterLineDO> searchBomMx(Long task_id,Long project_id){
long a = 0;
//查询BOM明细
List<ProcessBomDO> processBomDOList = processBomMapper.selectBomMx(task_id,project_id);
List<ProcessBomDO> processBomDOList = processBomMapper.selectBomMx(task_id,project_id,a);
List<PgMasterLineDO> pgMasterLineDOList = new ArrayList<>();
processBomDOList.forEach( o ->{
PgMasterLineDO pgMasterLineDO = new PgMasterLineDO();