diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java index 80d077f..55bded5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java @@ -76,7 +76,7 @@ public interface ZjPgMasterService { List getZjPgMasterLineListByZlPgId(Integer zlPgId); - Boolean insertZjList(Long task_id,Long project_id); + Boolean insertZjList(Long task_id,Long project_id,Long planSubId); List searchZXMMx(Long task_id,Long project_id); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java index 6f9d264..de700b7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java @@ -69,9 +69,9 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService { } @Override - public Boolean insertZjList(Long task_id,Long project_id){ + public Boolean insertZjList(Long task_id,Long project_id,Long planSubId){ //查询BOM明细 - List planDOList = planMapper.searchZXMMx(task_id,project_id); + List planDOList = planMapper.searchZXMMx(task_id,project_id,planSubId); List zjPgMasterLineDOList = new ArrayList<>(); planDOList.forEach( o ->{ MouldTypeDO mouldTypeDO = mouldTypeMapper.selectById(o.getMouldId()); @@ -129,8 +129,9 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService { @Override public List searchZXMMx(Long task_id,Long project_id){ + long a = 0; //查询BOM明细 - List planDOList = planMapper.searchZXMMx(task_id,project_id); + List planDOList = planMapper.searchZXMMx(task_id,project_id,a); List zjPgMasterLineDOList = new ArrayList<>(); planDOList.forEach( o ->{ MouldTypeDO mouldTypeDO = mouldTypeMapper.selectById(o.getMouldId());