root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加回温报表和原料库报表

Browse Source
This commit is contained in:
psh
2024-07-26 17:53:44 +08:00
parent 075d6ba99f
commit ece66065d9
17 changed files with 1259 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java
View File

@@ -204,27 +204,31 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
/**
* 导出excel
*/
public static void downloadExcel(List<Map<String, Object>> list, HttpServletResponse response) throws IOException {
String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx";
File file = new File(tempPath);
BigExcelWriter writer = ExcelUtil.getBigWriter(file);
// 一次性写出内容，使用默认样式，强制输出标题
writer.write(list, true);
SXSSFSheet sheet = (SXSSFSheet)writer.getSheet();
//上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法
sheet.trackAllColumnsForAutoSizing();
//列宽自适应
writer.autoSizeColumnAll();
//response为HttpServletResponse对象
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
//test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
response.setHeader("Content-Disposition", "attachment;filename=file.xlsx");
ServletOutputStream out = response.getOutputStream();
// 终止后删除临时文件
file.deleteOnExit();
writer.flush(out, true);
//此处记得关闭输出Servlet流
IoUtil.close(out);
public static void downloadExcel(List<Map<String, Object>> list, HttpServletResponse response) {
try {
String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx";
File file = new File(tempPath);
BigExcelWriter writer = ExcelUtil.getBigWriter(file);
// 一次性写出内容，使用默认样式，强制输出标题
writer.write(list, true);
SXSSFSheet sheet = (SXSSFSheet) writer.getSheet();
//上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法
sheet.trackAllColumnsForAutoSizing();
//列宽自适应
writer.autoSizeColumnAll();
//response为HttpServletResponse对象
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
//test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
response.setHeader("Content-Disposition", "attachment;filename=file.xlsx");
ServletOutputStream out = response.getOutputStream();
// 终止后删除临时文件
file.deleteOnExit();
writer.flush(out, true);
//此处记得关闭输出Servlet流
IoUtil.close(out);
}catch(IOException e){
log.error("下载文件失败[][]",e,e.getMessage());
}
}
public static String getFileType(String type) {

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.mes.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@@ -21,4 +22,9 @@ public class QPMES060RequestBody {
private double incomingLength;
private double incomingWeight;
private double incomingchipping;
private String ingotBatch;
private String siliconGrade;
private String siliconPolarity;
private double weightCoefficientValue;
private String lineDiameter;
}

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java
View File

@@ -58,6 +58,16 @@ public class Material implements Serializable {
private String group_bind_material_status;
@ApiModelProperty(value = "棒源等级")
private String barLevel;
@ApiModelProperty(value = "客户来料批次号")
private String ingotBatch;
@ApiModelProperty(value = "晶棒等级")
private String siliconGrade;
@ApiModelProperty(value = "晶棒等级")
private String siliconPolarity;
@ApiModelProperty(value = "重量")
private String weightCoefficientValue;
@ApiModelProperty(value = "线直径")
private String lineDiameter;
public void copyFrom(QPMES060RequestBody source){

39
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.sch.report;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
@@ -13,6 +14,8 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@Slf4j
@RestController
@Api(tags = "报表管理")
@@ -23,13 +26,38 @@ public class ReportController {
private IReportService reportService;
@GetMapping
@Log("查询组盘信息管理")
@ApiOperation("查询组盘信息管理")
@Log("查询报表管理")
@ApiOperation("查询报表管理")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> query(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryAll(whereJson,page)),HttpStatus.OK);
}
@GetMapping("/yl/detail")
@Log("原料库库存明细")
@ApiOperation("原料库库存明细")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> queryYlDetail(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryYlDetail(whereJson,page)),HttpStatus.OK);
}
@GetMapping("/hw/detail")
@Log("回温间库存明细")
@ApiOperation("回温间库存明细")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> queryHwDetail(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwDetail(whereJson,page)),HttpStatus.OK);
}
@SneakyThrows
@GetMapping("/yl/download")
@Log("查询详情导出")
@ApiOperation("查询详情导出")
//@SaCheckPermission("@el.check('material:list')")
public void queryDetailDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryYlDownload(whereJson,page,response);
}
@GetMapping("/getSupplierNameList")
@Log("查询供应商名称列表")
@ApiOperation("查询供应商名称列表")
@@ -46,5 +74,12 @@ public class ReportController {
return new ResponseEntity<>(TableDataInfo.build(reportService.getProductDescriptionList()),HttpStatus.OK);
}
@GetMapping("/getLotSNList")
@Log("查询晶棒编号列表")
@ApiOperation("查询晶棒编号列表")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> getLotSNList(){
return new ResponseEntity<>(TableDataInfo.build(reportService.getLotSNList()),HttpStatus.OK);
}
}

12
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java
View File

@@ -3,9 +3,13 @@ package org.nl.wms.sch.report.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.sch.report.service.dto.HwDto;
import org.nl.wms.sch.report.service.dto.ReportDto;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import org.nl.wms.sch.report.service.dto.YlDto;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@@ -19,8 +23,16 @@ public interface IReportService extends IService<ReportDto> {
*/
IPage<ReportDto> queryAll(ReportQuery whereJson, PageQuery pageable);
IPage<HwDto> queryHwDetail(ReportQuery whereJson, PageQuery pageable);
IPage<YlDto> queryYlDetail(ReportQuery whereJson, PageQuery pageable);
void queryYlDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
List<String> getSupplierNameList();
List<String> getProductDescriptionList();
List<String> getLotSNList();
}

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java
View File

@@ -3,10 +3,10 @@ package org.nl.wms.sch.report.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Select;
import org.nl.wms.pdm.service.dao.PdmBdWorkorder;
import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery;
import org.nl.wms.sch.report.service.dto.HwDto;
import org.nl.wms.sch.report.service.dto.ReportDto;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import org.nl.wms.sch.report.service.dto.YlDto;
import java.util.List;
@@ -22,9 +22,20 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
*/
IPage<ReportDto> queryReport(IPage<ReportDto> pages, ReportQuery query);
/**
* 分页查找
* @return
*/
IPage<YlDto> queryYlDetail(IPage<YlDto> pages, ReportQuery query);
IPage<HwDto> queryHwDetail(IPage<HwDto> pages, ReportQuery query);
@Select("select supplierName from sch_base_material group by supplierName")
List<String> getSupplierNameList();
@Select("select productDescription from sch_base_material group by productDescription")
List<String> getProductDescriptionList();
@Select("select lotSN from sch_base_material")
List<String> getLotSNList();
}

87
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
View File

@@ -33,4 +33,91 @@
ORDER BY point_code ASC
</select>
<select id="queryYlDetail" resultType="org.nl.wms.sch.report.service.dto.YlDto">
SELECT
m.lotSN,
p.point_code as pointCode,
p.point_name as pointName,
p.region_code as regionCode,
p.region_name as regionName,
p.vehicle_code2 as subTray,
p.vehicle_code as motherTray,
p.update_time as updateTime,
m.productDescription,
m.supplierName,
m.ingotBatch,
m.incomingLength,
m.incomingWeight
FROM
sch_base_point p,sch_base_material m
WHERE
p.vehicle_code2 = m.PalletSN
and
vehicle_code2!='' AND vehicle_code2 is not null
<if test="query.supplierName != null">
and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
</if>
<if test="query.productDescription != null">
and m.productDescription like CONCAT('%', #{query.productDescription}, '%')
</if>
<if test="query.point_code != null">
and p.point_code like CONCAT('%', #{query.point_code}, '%')
</if>
<if test="query.region_code != null">
and p.region_code like CONCAT('%', #{query.region_code}, '%')
</if>
<if test="query.lotSN != null">
and m.lotSN like CONCAT('%', #{query.lotSN}, '%')
</if>
ORDER BY point_code ASC
</select>
<select id="queryHwDetail" resultType="org.nl.wms.sch.report.service.dto.HwDto">
SELECT a.*,( SELECT count( * ) FROM sch_base_material m2 WHERE m2.PalletSN = a.subTray ) as number
FROM
(
SELECT
p.point_code AS pointCode,
p.point_name AS pointName,
p.region_code AS regionCode,
p.region_name AS regionName,
p.vehicle_code2 AS subTray,
p.vehicle_code AS motherTray,
p.update_time AS updateTime,
ANY_VALUE ( v.standing_time ) AS standingTime,
ANY_VALUE ( m.productDescription ) AS productDescription,
ANY_VALUE ( m.supplierName ) AS supplierName,
ANY_VALUE ( m.ingotBatch ) AS ingotBatch,
TIMESTAMPDIFF(
HOUR,
p.update_time,
curtime()) AS usedTime
FROM
sch_base_point p
LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.PalletSN
LEFT JOIN sch_base_vehiclematerialgroup v ON p.point_code = v.point_code
WHERE
vehicle_code2 != ''
AND vehicle_code2 IS NOT NULL
<if test="query.supplierName != null">
and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
</if>
<if test="query.productDescription != null">
and m.productDescription like CONCAT('%', #{query.productDescription}, '%')
</if>
<if test="query.point_code != null">
and p.point_code like CONCAT('%', #{query.point_code}, '%')
</if>
<if test="query.region_code != null">
and p.region_code like CONCAT('%', #{query.region_code}, '%')
</if>
<if test="query.lotSN != null">
and m.lotSN like CONCAT('%', #{query.lotSN}, '%')
</if>
GROUP BY
pointCode
ORDER BY pointCode ASC
) a
</select>
</mapper>

33
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java Normal file
View File

@@ -0,0 +1,33 @@
package org.nl.wms.sch.report.service.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class HwDto implements Serializable {
/** 点位编码 */
private String pointCode;
/** 点位名称 */
private String pointName;
/** 区域编码 */
private String regionCode;
/** 区域名称 */
private String regionName;
/** 子托号 */
private String subTray;
/** 母拖号 */
private String motherTray;
/** 物料名称 */
private String productDescription;
/** 供应商名称 */
private String supplierName;
/** 入库时间 */
private String updateTime;
/** 回温时间 */
private String standingTime;
/** 已回温时间 */
private String usedTime;
/** 数量 */
private String number;
}

38
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YlDto.java Normal file
View File

@@ -0,0 +1,38 @@
package org.nl.wms.sch.report.service.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
public class YlDto implements Serializable {
/** 点位编码 */
private String pointCode;
/** 点位名称 */
private String pointName;
/** 区域编码 */
private String regionCode;
/** 区域名称 */
private String regionName;
/** 子托号 */
private String subTray;
/** 母拖号 */
private String motherTray;
/** 物料名称 */
private String productDescription;
/** 供应商名称 */
private String supplierName;
/** 入库时间 */
private String updateTime;
/** 棒源等级 */
private String barLevel;
/** 客户来料批次号 */
private String ingotBatch;
/** 晶棒号 */
private String lotSN;
/** 来料长度 */
private String incomingLength;
/** 来料重量 */
private String incomingWeight;
}

51
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java
View File

@@ -7,19 +7,27 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.FileUtil;
import org.nl.wms.pdm.service.dao.PdmBdWorkorder;
import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery;
import org.nl.wms.sch.material.service.dao.Material;
import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper;
import org.nl.wms.sch.report.service.IReportService;
import org.nl.wms.sch.report.service.dao.mapper.ReportMapper;
import org.nl.wms.sch.report.service.dto.HwDto;
import org.nl.wms.sch.report.service.dto.ReportDto;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import org.nl.wms.sch.report.service.dto.YlDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.nl.common.utils.PageUtil;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
@@ -33,7 +41,46 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
IPage<ReportDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = reportMapper.queryReport(pages, query);
return pages;
}
@Override
public IPage<YlDto> queryYlDetail(ReportQuery query, PageQuery pageQuery){
IPage<YlDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = reportMapper.queryYlDetail(pages, query);
return pages;
}
public IPage<HwDto> queryHwDetail(ReportQuery query, PageQuery pageQuery){
IPage<HwDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = reportMapper.queryHwDetail(pages, query);
return pages;
}
@Override
public void queryYlDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<YlDto> pages = this.queryYlDetail(query,pageQuery);
List<Map<String, Object>> list = new ArrayList<>();
for(YlDto detailDto:pages.getRecords()){
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("点位编码",detailDto.getPointCode());
mp.put("点位名称",detailDto.getPointCode());
mp.put("区域编码",detailDto.getRegionCode());
mp.put("区域名称",detailDto.getRegionName());
mp.put("子托号",detailDto.getSubTray());
mp.put("母拖号",detailDto.getMotherTray());
mp.put("物料名称",detailDto.getProductDescription());
mp.put("供应商名称",detailDto.getSupplierName());
mp.put("入库时间",detailDto.getUpdateTime());
mp.put("棒源等级",detailDto.getBarLevel());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("晶棒号",detailDto.getLotSN());
mp.put("来料长度",detailDto.getIncomingLength());
mp.put("来料重量",detailDto.getIncomingWeight());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
public List<String> getSupplierNameList(){
@@ -44,5 +91,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
return reportMapper.getProductDescriptionList();
}
public List<String> getLotSNList(){
return reportMapper.getLotSNList();
}
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
View File

@@ -307,11 +307,13 @@ public class YCLCKTask extends AbstractTask {
// 终点解锁
if (ObjectUtil.isNotEmpty(endPointObj)) {
endPointObj.setIng_task_code("");
endPointObj.setUpdate_time(DateUtil.now());
pointService.update(endPointObj);
}
// 起点解锁
if (ObjectUtil.isNotEmpty(startPointObj)) {
startPointObj.setIng_task_code("");
startPointObj.setUpdate_time(DateUtil.now());
pointService.update(startPointObj);
}
taskObj.setRemark("任务取消");

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
View File

@@ -179,6 +179,7 @@ public class YCLRKTask extends AbstractTask {
endPointObj.setIng_task_code("");
endPointObj.setVehicle_code(taskObj.getVehicle_code());
endPointObj.setVehicle_code2(taskObj.getVehicle_code2());
endPointObj.setUpdate_time(DateUtil.now());
endPointObj.setVehicle_qty(1);
pointService.update(endPointObj);
// 要把数据存到组盘表 -> 改造公共方法，返回id