psh 9 months ago
parent
commit
e8ff1c974b
  1. 8
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KcDto.java
  2. 2
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java
  3. 26
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
  4. 69
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java
  5. 14
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java
  6. 8
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java
  7. 190
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
  8. 130
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/KcDto.java

@ -6,9 +6,9 @@ import java.util.List;
@Data
public class KcDto {
// private String sum;
// private String weight;
// private String pendSum;
// private String pendWeight;
private String sum;
private String weight;
private String pendSum;
private String pendWeight;
private List<WuliaoDto> list;
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java

@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class WuliaoDto {
String productDescription;
String specification;
String supplierName;
Double count1;
Double count2;
Double count3;

26
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml

@ -126,18 +126,22 @@
<select id="wuliao" resultType="org.nl.wms.board.service.dao.dto.WuliaoDto">
SELECT
a.NAME,
a.number,
FLOOR( a.number / b.sum * 100 ) AS percentage
supplierName,
productDescription,
count(*) AS count1,
COUNT(DISTINCT p.vehicle_code2) AS count2,
sum( incomingWeight ) AS count3,
sum( incomingLength ) AS count4
FROM
( SELECT productDescription AS NAME, count(*) AS number FROM sch_base_material WHERE incomingWeight > 0 GROUP BY productDescription ) a,(
SELECT
count(*) AS sum
FROM
sch_base_material
WHERE
incomingWeight > 0
) b
sch_base_material m
LEFT JOIN sch_base_point p ON p.vehicle_code2 = m.PalletSN
WHERE
p.region_code LIKE '%YL%'
AND p.vehicle_code2 != ''
AND p.vehicle_code2 IS NOT NULL
GROUP BY
supplierName,
productDescription
</select>
<select id="cz" resultType="org.nl.wms.board.service.dao.dto.CzDto">

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

@ -41,6 +41,23 @@ public class ReportController {
return new ResponseEntity<>(TableDataInfo.build(reportService.queryYlDetail(whereJson,page)),HttpStatus.OK);
}
@GetMapping("/yl/in")
@Log("原材入库明细")
@ApiOperation("原材入库明细")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> queryYlIn(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryYlIn(whereJson,page)),HttpStatus.OK);
}
@GetMapping("/yl/out")
@Log("原料库出库明细")
@ApiOperation("原料库出库明细")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> queryYlOut(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryYlOut(whereJson,page)),HttpStatus.OK);
}
@GetMapping("/hw/detail")
@Log("回温间库存明细")
@ApiOperation("回温间库存明细")
@ -49,6 +66,22 @@ public class ReportController {
return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwDetail(whereJson,page)),HttpStatus.OK);
}
@GetMapping("/hw/in")
@Log("回温间入库明细")
@ApiOperation("回温间入库明细")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> queryHwIn(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwIn(whereJson,page)),HttpStatus.OK);
}
@GetMapping("/hw/out")
@Log("回温间出库存明细")
@ApiOperation("回温间出库明细")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> queryHwOut(ReportQuery whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwOut(whereJson,page)),HttpStatus.OK);
}
@SneakyThrows
@GetMapping("/yl/detail/download")
@Log("查询详情导出")
@ -58,6 +91,24 @@ public class ReportController {
reportService.queryYlDetailDownload(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/yl/in/download")
@Log("查询详情导出")
@ApiOperation("查询详情导出")
//@SaCheckPermission("@el.check('material:list')")
public void queryYlInDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryYlInDownload(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/yl/out/download")
@Log("查询详情导出")
@ApiOperation("查询详情导出")
//@SaCheckPermission("@el.check('material:list')")
public void queryYlOutDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryYlOutDownload(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/hw/detail/download")
@Log("查询详情导出")
@ -67,6 +118,24 @@ public class ReportController {
reportService.queryHwDetailDownload(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/hw/in/download")
@Log("查询详情导出")
@ApiOperation("查询详情导出")
//@SaCheckPermission("@el.check('material:list')")
public void queryHwInDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryHwInDownload(whereJson,page,response);
}
@SneakyThrows
@GetMapping("/hw/out/download")
@Log("查询详情导出")
@ApiOperation("查询详情导出")
//@SaCheckPermission("@el.check('material:list')")
public void queryHwOutDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
reportService.queryHwOutDownload(whereJson,page,response);
}
@GetMapping("/getSupplierNameList")
@Log("查询供应商名称列表")
@ApiOperation("查询供应商名称列表")

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

@ -25,11 +25,25 @@ public interface IReportService extends IService<ReportDto> {
IPage<HwDto> queryHwDetail(ReportQuery whereJson, PageQuery pageable);
IPage<HwDto> queryHwIn(ReportQuery whereJson, PageQuery pageable);
IPage<HwDto> queryHwOut(ReportQuery whereJson, PageQuery pageable);
IPage<YlDto> queryYlDetail(ReportQuery whereJson, PageQuery pageable);
IPage<YlDto> queryYlIn(ReportQuery whereJson, PageQuery pageable);
IPage<YlDto> queryYlOut(ReportQuery whereJson, PageQuery pageable);
void queryYlDetailDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryYlInDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryYlOutDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryHwDetailDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryHwInDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
void queryHwOutDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
List<String> getSupplierNameList();

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

@ -28,8 +28,16 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
*/
IPage<YlDto> queryYlDetail(IPage<YlDto> pages, ReportQuery query);
IPage<YlDto> queryYlIn(IPage<YlDto> pages, ReportQuery query);
IPage<YlDto> queryYlOut(IPage<YlDto> pages, ReportQuery query);
IPage<HwDto> queryHwDetail(IPage<HwDto> pages, ReportQuery query);
IPage<HwDto> queryHwIn(IPage<HwDto> pages, ReportQuery query);
IPage<HwDto> queryHwOut(IPage<HwDto> pages, ReportQuery query);
@Select("select supplierName from sch_base_material group by supplierName")
List<String> getSupplierNameList();

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

@ -75,6 +75,90 @@
ORDER BY point_code ASC
</select>
<select id="queryYlIn" 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,
t.update_time as updateTime,
m.*
FROM
sch_base_task t,sch_base_point p,sch_base_material m
WHERE
p.vehicle_code2 = m.PalletSN
and
t.point_code2 like 'HJ%'
and
t.point_code2=p.point_code
and
p.vehicle_code2!='' AND p.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>
<if test="query.ingotBatch != null">
and m.ingotBatch like CONCAT('%', #{query.ingotBatch}, '%')
</if>
ORDER BY t.update_time DESC,point_code ASC
</select>
<select id="queryYlOut" 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,
t.update_time as updateTime,
m.*
FROM
sch_base_task t,sch_base_point p,sch_base_material m
WHERE
p.vehicle_code2 = m.PalletSN
and
t.point_code2 like 'XHW%'
and
t.point_code2=p.point_code
and
p.vehicle_code2!='' AND p.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>
<if test="query.ingotBatch != null">
and m.ingotBatch like CONCAT('%', #{query.ingotBatch}, '%')
</if>
ORDER BY t.update_time DESC,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
@ -127,4 +211,110 @@
) a
</select>
<select id="queryHwIn" 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.siliconGrade ) AS siliconGrade,
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_task t
LEFT JOIN sch_base_point p on t.point_code2=p.point_code and t.point_code2 like 'XHW%'
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
p.vehicle_code2 != ''
AND p.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>
<if test="query.ingotBatch != null">
and m.ingotBatch like CONCAT('%', #{query.ingotBatch}, '%')
</if>
GROUP BY
pointCode
ORDER BY p.update_time DESC, pointCode ASC
) a
</select>
<select id="queryHwOut" 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.siliconGrade ) AS siliconGrade,
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_task t
LEFT JOIN sch_base_point p on t.point_code2=p.point_code and t.point_code1 like 'XHW%'
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
p.vehicle_code2 != ''
AND p.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>
<if test="query.ingotBatch != null">
and m.ingotBatch like CONCAT('%', #{query.ingotBatch}, '%')
</if>
GROUP BY
pointCode
ORDER BY p.update_time DESC, pointCode ASC
) a
</select>
</mapper>

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

@ -50,12 +50,38 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
return pages;
}
@Override
public IPage<YlDto> queryYlIn(ReportQuery query, PageQuery pageQuery){
IPage<YlDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = reportMapper.queryYlIn(pages, query);
return pages;
}
@Override
public IPage<YlDto> queryYlOut(ReportQuery query, PageQuery pageQuery){
IPage<YlDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = reportMapper.queryYlOut(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;
}
public IPage<HwDto> queryHwIn(ReportQuery query, PageQuery pageQuery){
IPage<HwDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = reportMapper.queryHwIn(pages, query);
return pages;
}
public IPage<HwDto> queryHwOut(ReportQuery query, PageQuery pageQuery){
IPage<HwDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = reportMapper.queryHwOut(pages, query);
return pages;
}
@Override
public void queryYlDetailDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
@ -83,6 +109,58 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
FileUtil.downloadExcel(list, response);
}
@Override
public void queryYlInDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<YlDto> pages = this.queryYlIn(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.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("晶棒号",detailDto.getLotSN());
mp.put("来料长度",detailDto.getIncomingLength());
mp.put("来料重量",detailDto.getIncomingWeight());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void queryYlOutDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<YlDto> pages = this.queryYlOut(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.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("晶棒号",detailDto.getLotSN());
mp.put("来料长度",detailDto.getIncomingLength());
mp.put("来料重量",detailDto.getIncomingWeight());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void queryHwDetailDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
@ -109,6 +187,58 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
FileUtil.downloadExcel(list, response);
}
@Override
public void queryHwInDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<HwDto> pages = this.queryHwIn(query,pageQuery);
List<Map<String, Object>> list = new ArrayList<>();
for(HwDto 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.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("回温时间",detailDto.getStandingTime());
mp.put("已回温时间",detailDto.getUsedTime());
mp.put("数量",detailDto.getNumber());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
@Override
public void queryHwOutDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
pageQuery.setSize(99999);
IPage<HwDto> pages = this.queryHwOut(query,pageQuery);
List<Map<String, Object>> list = new ArrayList<>();
for(HwDto 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.getSiliconGrade());
mp.put("客户来料批次号",detailDto.getIngotBatch());
mp.put("回温时间",detailDto.getStandingTime());
mp.put("已回温时间",detailDto.getUsedTime());
mp.put("数量",detailDto.getNumber());
list.add(mp);
}
FileUtil.downloadExcel(list, response);
}
public List<String> getSupplierNameList(){
return reportMapper.getSupplierNameList();

Loading…
Cancel
Save