Browse Source

PQC任务 增加 查询SOP编码

java8
赵宏斌 8 months ago
parent
commit
b52904080a
  1. 13
      src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java
  2. 34
      src/main/java/com/xujie/sys/modules/pms/data/PartSopData.java
  3. 2
      src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java
  4. 5
      src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java
  5. 2
      src/main/java/com/xujie/sys/modules/pms/service/PqcService.java
  6. 7
      src/main/resources/mapper/pms/PqcMapper.xml

13
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<PartSopData> list = pqcService.querySopNum(data);
if (list.isEmpty()){
return R.ok().put("code",2);
}
return R.ok().put("rows",list);
}
}

34
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;
}

2
src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java

@ -83,4 +83,6 @@ public interface PqcMapper {
List<OperationForResource> getResourceDataOperationForResource(OperationForResource data);
int deleteOperationForResource2(OperationForResource data);
List<PartSopData> querySopNum(PartSopData data);
}

5
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<PartSopData> querySopNum(PartSopData data) {
return pqcMapper.querySopNum(data);
}
}

2
src/main/java/com/xujie/sys/modules/pms/service/PqcService.java

@ -69,4 +69,6 @@ public interface PqcService {
List<OperationForResource> getResourceDataOperationForResource(OperationForResource data);
int deleteOperationForResource2(OperationForResource data);
List<PartSopData> querySopNum(PartSopData data);
}

7
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}
</select>
<select id="querySopNum" resultType="com.xujie.sys.modules.pms.data.PartSopData">
SELECT top 1 s.id,s.sop_type,s.phase_in_date,s.phase_out_date,sop_no,sop_name,sop_url, s.creation_date, s.created_by, s.version,s.part_no,sop_status,p.part_desc
FROM part_sop s
left join part p on s.part_no = p.part_no and s.site = p.site
where s.site = #{site} and s.part_no = #{partNo} and s.sop_type = #{sopType} and sop_status = #{sopStatus}
order by s.phase_in_date desc
</select>
</mapper>

Loading…
Cancel
Save