Browse Source

修改pqc任务预览功能

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

11
src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java

@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
@ -401,5 +403,14 @@ public class PqcController {
}
return R.ok().put("rows",list);
}
/**
* 预览SOP
* @param
* @return
*/
@PostMapping("/previewSopFile")
public void previewSopFile(@RequestBody PartSopData data ,HttpServletResponse response) throws UnsupportedEncodingException {
pqcService.previewSopFile(data,response);
}
}

4
src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java

@ -29,6 +29,10 @@ public class QcFAIRecordData extends QueryPage {
private String supplierDesc;
// 检验结果
private String inspectionResult;
//sop类型
private String sopType;
//sopurl
private String sopUrl;
// 送检日期
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")

38
src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xujie.sys.common.utils.PageUtils;
import com.xujie.sys.modules.orderIssure.vo.Part;
import com.xujie.sys.modules.oss.dao.SysOssDao;
import com.xujie.sys.modules.oss.entity.SysOssEntity;
import com.xujie.sys.modules.oss.service.SysOssService;
import com.xujie.sys.modules.pms.data.*;
import com.xujie.sys.modules.pms.entity.PurchaseOrder;
@ -26,7 +27,11 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
import java.util.stream.Collectors;
@ -807,4 +812,37 @@ public class PqcServiceImpl implements PqcService {
public List<PartSopData> querySopNum(PartSopData data) {
return pqcMapper.querySopNum(data);
}
private static final String SOPURL = "172.26.68.17";
@Override
public void previewSopFile( PartSopData data,HttpServletResponse response) throws UnsupportedEncodingException {
String url = SOPURL+data.getSopUrl();
// 创建文件对象
File file = new File(url);
if (!file.exists()) {
throw new IllegalArgumentException("文件不存在");
}
String encodedFileName = URLEncoder.encode("sop", "UTF-8");
// 设置响应头
response.setContentType("application/pdf;charset=utf-8");
response.setHeader("Content-Disposition", "attachment; filename=" + encodedFileName);
try (FileInputStream fis = new FileInputStream(file);
BufferedInputStream bis = new BufferedInputStream(fis);
ServletOutputStream os = response.getOutputStream()) {
byte[] buffer = new byte[1024];
int bytesRead;
// 循环读取文件内容并写入到响应流中
while ((bytesRead = bis.read(buffer)) != -1) {
os.write(buffer, 0, bytesRead);
}
} catch (IOException e) {
throw new RuntimeException("文件下载失败", e);
}
}
}

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

@ -7,6 +7,8 @@ import com.xujie.sys.modules.pms.data.*;
import com.xujie.sys.modules.pms.entity.vo.CheckSubDetailValueVo;
import com.xujie.sys.modules.sys.entity.SysUserEntity;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.util.List;
public interface PqcService {
@ -71,4 +73,6 @@ public interface PqcService {
int deleteOperationForResource2(OperationForResource data);
List<PartSopData> querySopNum(PartSopData data);
void previewSopFile( PartSopData data,HttpServletResponse response) throws UnsupportedEncodingException;
}

8
src/main/resources/mapper/pms/PqcMapper.xml

@ -49,7 +49,9 @@
isnull(dbo.joint_name2(a.site, a.bu_no, a.inspection_no, 'responsible'), '') as responsiblePersonName,
a.pass_qty,
a.not_pass_qty,
a.batch_qualified_qty
a.batch_qualified_qty,
a.sop_type,
a.sop_url
FROM qc_pqc_record as a
left join part as d on a.site = d.site and a.bu_no = d.sourceBu and a.part_no = d.part_no
left join sys_user as u on a.inspector_no = u.username
@ -271,10 +273,10 @@
<insert id="savePQCRecord" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
INSERT INTO qc_pqc_record
(inspection_no, site, bu_no, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no,
roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id,change_line_time,sop_num,eam_object_id)
roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id,change_line_time,sop_num,eam_object_id,sop_type,sop_url)
VALUES
(#{inspectionNo}, #{site}, #{buNo}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo},
#{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId},#{changeLineTime},#{sopNum},#{eamObjectId})
#{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId},#{changeLineTime},#{sopNum},#{eamObjectId},#{sopType},#{sopUrl})
</insert>
<insert id="saveUserDefaultOperation">
insert into user_default_operation(username,operation,bu,bu_no,site) VALUES(#{params.username},#{params.operation},#{params.bu},#{params.buNo},#{params.site})

Loading…
Cancel
Save