diff --git a/src/main/java/com/gaotao/modules/pms/controller/QcController.java b/src/main/java/com/gaotao/modules/pms/controller/QcController.java index 98d9a07..087ec71 100644 --- a/src/main/java/com/gaotao/modules/pms/controller/QcController.java +++ b/src/main/java/com/gaotao/modules/pms/controller/QcController.java @@ -1633,6 +1633,28 @@ public class QcController { return R.ok(); } + // ======================= BOM清单API ======================= + + /** + * BOM清单查询 + **/ + @PostMapping("/bomListSearch") + public R bomListSearch(@RequestBody BomListData data){ + PageUtils page = qcService.bomListSearch(data); + return R.ok().put("page", page); + } + + // ======================= Routing清单API ======================= + + /** + * Routing清单查询 + **/ + @PostMapping("/routingListSearch") + public R routingListSearch(@RequestBody RoutingListData data){ + PageUtils page = qcService.routingListSearch(data); + return R.ok().put("page", page); + } + } diff --git a/src/main/java/com/gaotao/modules/pms/data/BomListData.java b/src/main/java/com/gaotao/modules/pms/data/BomListData.java new file mode 100644 index 0000000..5b03298 --- /dev/null +++ b/src/main/java/com/gaotao/modules/pms/data/BomListData.java @@ -0,0 +1,34 @@ +package com.gaotao.modules.pms.data; + +import lombok.Data; + +import java.util.Date; + +/** + * BOM清单数据传输对象 + */ +@Data +public class BomListData { + + /** + * 分页参数 + */ + private Integer page; + private Integer limit; + + /** + * 查询条件 + */ + private String site; + private String buNo; + private String partNo; + + /** + * BOM数据字段 + */ + private String revno; + private String bomtype; + private String status; + private Date phaseindate; + private Date phaseoutdate; +} diff --git a/src/main/java/com/gaotao/modules/pms/data/RoutingListData.java b/src/main/java/com/gaotao/modules/pms/data/RoutingListData.java new file mode 100644 index 0000000..a7395b3 --- /dev/null +++ b/src/main/java/com/gaotao/modules/pms/data/RoutingListData.java @@ -0,0 +1,34 @@ +package com.gaotao.modules.pms.data; + +import lombok.Data; + +import java.util.Date; + +/** + * Routing清单数据传输对象 + */ +@Data +public class RoutingListData { + + /** + * 分页参数 + */ + private Integer page; + private Integer limit; + + /** + * 查询条件 + */ + private String site; + private String buNo; + private String partNo; + + /** + * Routing数据字段 + */ + private String revno; + private String routingtype; + private String status; + private Date phaseindate; + private Date phaseoutdate; +} diff --git a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java index ba838bb..c82606e 100644 --- a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java @@ -446,4 +446,18 @@ public interface QcMapper { * 删除SOP记录 */ void deleteSopRecord(@Param("params") Map params); + + // ======================= BOM清单相关方法 ======================= + + /** + * BOM清单查询 + */ + IPage bomListSearch(Page page, @Param("query") BomListData data); + + // ======================= Routing清单相关方法 ======================= + + /** + * Routing清单查询 + */ + IPage routingListSearch(Page page, @Param("query") RoutingListData data); } diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java index 6ce34c5..c0bd64a 100644 --- a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java @@ -3507,6 +3507,32 @@ public class QcServiceImpl implements QcService { qcMapper.deleteSopRecord(params); } + // ======================= BOM清单相关方法 ======================= + + /** + * BOM清单查询 + */ + @Override + @Transactional + public PageUtils bomListSearch(BomListData data) { + IPage resultList = this.qcMapper.bomListSearch( + new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } + + // ======================= Routing清单相关方法 ======================= + + /** + * Routing清单查询 + */ + @Override + @Transactional + public PageUtils routingListSearch(RoutingListData data) { + IPage resultList = this.qcMapper.routingListSearch( + new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } + } diff --git a/src/main/java/com/gaotao/modules/pms/service/QcService.java b/src/main/java/com/gaotao/modules/pms/service/QcService.java index 071d5fe..2d2fe4f 100644 --- a/src/main/java/com/gaotao/modules/pms/service/QcService.java +++ b/src/main/java/com/gaotao/modules/pms/service/QcService.java @@ -246,4 +246,18 @@ public interface QcService { * 删除SOP记录 */ void deleteSopRecord(Map params); + + // ======================= BOM清单相关方法 ======================= + + /** + * BOM清单查询 + */ + PageUtils bomListSearch(BomListData data); + + // ======================= Routing清单相关方法 ======================= + + /** + * Routing清单查询 + */ + PageUtils routingListSearch(RoutingListData data); } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 4c3f58d..75beb9f 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -3253,6 +3253,60 @@ + + + + + + + + + +