diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java index 2c63382c..222d9fed 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java @@ -437,4 +437,12 @@ public class EamProjectController { List list = eamProjectService.searchMassProductionBomList(inData); return R.ok().put("list", list); } + + @PostMapping("/searchRoutingList") + @ResponseBody + public R searchRoutingList(@RequestBody EamProjectPartInfoData inData) { + List list = eamProjectService.searchRoutingList(inData); + return R.ok().put("list", list); + } + } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java index a8d9daed..fe85f045 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java @@ -120,6 +120,33 @@ public class EamProjectPartInfoData extends EamProjectInfoData{ @TableField(exist = false) private String LevelCode; + @TableField(exist = false) + private String workCenterNo; + + @TableField(exist = false) + private Integer itemNo; + + @TableField(exist = false) + private String routingItemNo; + + @TableField(exist = false) + private String itemDesc; + + @TableField(exist = false) + private float laborTime; + + @TableField(exist = false) + private float laborResources; + + @TableField(exist = false) + private float machRunFactor; + + @TableField(exist = false) + private String factorUnit; + + @TableField(exist = false) + private String partNo; + @Override public String getcQualityEngineer1() { return cQualityEngineer1; diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java index 9a015e0b..416090fb 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java @@ -125,4 +125,6 @@ public interface EamProjectMapper { List getEmailsByUsernames(@Param("usernames")List userNames, @Param("site") String site); List searchMassProductionBomList(@Param("data")EamProjectPartInfoData inData); + + List searchRoutingList(@Param("data")EamProjectPartInfoData inData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java index 581aa011..9ca6c251 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java @@ -83,4 +83,6 @@ public interface EamProjectService { void saveHandle(List list); List searchMassProductionBomList(EamProjectPartInfoData inData); + + List searchRoutingList(EamProjectPartInfoData inData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java index 92155126..52377680 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java @@ -379,6 +379,12 @@ public class EamProjectServiceImpl implements EamProjectService { return list; } + @Override + public List searchRoutingList(EamProjectPartInfoData inData) { + List list = EamProjectMapper.searchRoutingList(inData); + return list; + } + @Override public boolean checkProductionValidationDocument(List list) { for (ProjectProductionValidationDocumentData inData : list) { diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml index 5f8fb87e..fa94d3a2 100644 --- a/src/main/resources/mapper/pms/EamProjectMapper.xml +++ b/src/main/resources/mapper/pms/EamProjectMapper.xml @@ -582,6 +582,9 @@ resultType="com.xujie.sys.modules.pms.data.EamProjectPartInfoData"> {call dbo.plm_get_part_fullBOM(#{data.site, mode=IN}, #{data.projectId, mode=IN}, #{data.projectPartId, mode=IN})} + INSERT INTO plm_project_part ( site,