From 20667223588adae8f4950efbdc6aaab910ba1340 Mon Sep 17 00:00:00 2001 From: think <1787994136@qq.com> Date: Thu, 16 Jan 2025 08:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E7=BB=88?= =?UTF-8?q?=E6=A3=80=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=90=E9=A1=B9=E7=9B=AEID=E6=8E=A5=E5=8F=A3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/heli/service/zjpgmaster/ZjPgMasterService.java | 2 +- .../heli/service/zjpgmaster/ZjPgMasterServiceImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) 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());