diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java index 86eaf312..4ea3e024 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java @@ -388,5 +388,18 @@ public class PqcController { } return R.ok().put("rows",list); } + /** + * 根据物料查询SOP编码 + * @param + * @return + */ + @PostMapping("/querySopNum") + public R querySopNum(@RequestBody PartSopData data){ + List list = pqcService.querySopNum(data); + if (list.isEmpty()){ + return R.ok().put("code",2); + } + return R.ok().put("rows",list); + } } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/PartSopData.java b/src/main/java/com/xujie/sys/modules/pms/data/PartSopData.java new file mode 100644 index 00000000..e32e4e14 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/data/PartSopData.java @@ -0,0 +1,34 @@ +package com.xujie.sys.modules.pms.data; + +import lombok.Data; + +import java.util.Date; +@Data +public class PartSopData { + private Integer id; + private String sopNo; + private String sopName; + private String sopUrl; + private Date creationDate; + private String createdBy; + private String version; + private String partNo; + private String sopStatus; + + private String sopType; + private String site; + + private Date phaseInDate; + private Date phaseOutDate; + // MES设备ID + private String resourceId; + + private String partDesc; + private Date releasedDate; + + private String partType; + // 设备编码 + private String objectID; + + private String searchFlag; +} diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java index 9397014c..e4e08821 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java @@ -83,4 +83,6 @@ public interface PqcMapper { List getResourceDataOperationForResource(OperationForResource data); int deleteOperationForResource2(OperationForResource data); + + List querySopNum(PartSopData data); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java index 9a83288b..b4dc9e04 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java @@ -802,4 +802,9 @@ public class PqcServiceImpl implements PqcService { public int deleteOperationForResource2(OperationForResource data) { return pqcMapper.deleteOperationForResource2(data); } + + @Override + public List querySopNum(PartSopData data) { + return pqcMapper.querySopNum(data); + } } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java b/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java index 271e372c..05cdda5c 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java @@ -69,4 +69,6 @@ public interface PqcService { List getResourceDataOperationForResource(OperationForResource data); int deleteOperationForResource2(OperationForResource data); + + List querySopNum(PartSopData data); } diff --git a/src/main/resources/mapper/pms/PqcMapper.xml b/src/main/resources/mapper/pms/PqcMapper.xml index 4b898e0f..ec68343a 100644 --- a/src/main/resources/mapper/pms/PqcMapper.xml +++ b/src/main/resources/mapper/pms/PqcMapper.xml @@ -456,6 +456,13 @@ left join resource b on a.resource = b.resource_id where bu = #{bu} and operation = #{operation} +