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-08-01 17:59:26 +08:00
parent 0da286653e
commit f03c46edc2
25 changed files with 325 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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/SckbDto.java
View File

@@ -6,6 +6,8 @@ import java.util.List;
@Data
public class SckbDto {
private Integer ptNumber;
private List<ScDto> pt;
private Integer ksNumber;
private List<ScDto> ks;
}

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

@@ -4,8 +4,10 @@ import lombok.Data;
@Data
public class WuliaoDto {
String name;
String number;
String percentage;
String productDescription;
String specification;
Double count1;
Double count2;
Double count3;
Double count4;
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.board.service.dao.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Select;
import org.nl.wms.board.service.dao.dto.*;
import org.nl.wms.pdm.service.dao.PointDetail;
@@ -22,4 +23,10 @@ public interface BoardMapper {
KcDto kc();
List<WuliaoDto> wuliao();
@Select("select count(*) from sch_base_point where region_code ='HW' and (vehicle_code2='' OR vehicle_code2 is null)")
Integer ptNumber();
@Select("select count(*) from sch_base_point where region_code ='HWK' and (vehicle_code2='' OR vehicle_code2 is null)")
Integer ksNumber();
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
View File

@@ -63,6 +63,8 @@ public class BoardServiceImpl implements BoardService {
SckbDto sckbDto = new SckbDto();
sckbDto.setPt(boardMapper.sc("HW"));
sckbDto.setKs(boardMapper.sc("HWK"));
sckbDto.setPtNumber(boardMapper.ptNumber());
sckbDto.setKsNumber(boardMapper.ksNumber());
return JSONObject.parseObject(JSON.toJSONString(sckbDto, SerializerFeature.WriteNullStringAsEmpty));
}
}

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

@@ -22,6 +22,7 @@ public class QPMES060RequestBody {
private double incomingLength;
private double incomingWeight;
private double incomingchipping;
private String planZBNum;
private String ingotBatch;
private String siliconGrade;
private String siliconPolarity;

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dto/MaterialDataDto.java
View File

@@ -33,9 +33,6 @@ public class MaterialDataDto implements Serializable {
/** 来料批次 */
private String batch;
/** 棒源等级 */
private String barLevel;
/** 领料批次 */
private String pickingBatch;

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

@@ -56,17 +56,17 @@ public class Material implements Serializable {
private String incomingchipping;
@ApiModelProperty(value = "绑定状态")
private String group_bind_material_status;
@ApiModelProperty(value = "棒源等级")
private String barLevel;
@ApiModelProperty(value = "拼棒类型")
private String planZBNum;
@ApiModelProperty(value = "客户来料批次号")
private String ingotBatch;
@ApiModelProperty(value = "晶棒等级")
private String siliconGrade;
@ApiModelProperty(value = "晶棒等级")
@ApiModelProperty(value = "极性")
private String siliconPolarity;
@ApiModelProperty(value = "重量")
@ApiModelProperty(value = "重量折算系数")
private String weightCoefficientValue;
@ApiModelProperty(value = "线直径")
@ApiModelProperty(value = "线径")
private String lineDiameter;

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

@@ -91,4 +91,12 @@ public class ReportController {
return new ResponseEntity<>(TableDataInfo.build(reportService.getLotSNList()),HttpStatus.OK);
}
@GetMapping("/getIngotBatchList")
@Log("查询批次号列表")
@ApiOperation("查询批次号列表")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> getIngotBatchList(){
return new ResponseEntity<>(TableDataInfo.build(reportService.getIngotBatchList()),HttpStatus.OK);
}
}

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

@@ -37,4 +37,6 @@ public interface IReportService extends IService<ReportDto> {
List<String> getLotSNList();
List<String> getIngotBatchList();
}

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

@@ -38,4 +38,7 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
@Select("select lotSN from sch_base_material")
List<String> getLotSNList();
@Select("select ingotBatch from sch_base_material group by ingotBatch")
List<String> getIngotBatchList();
}

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

@@ -11,7 +11,8 @@
p.vehicle_code2 as subTray,
p.vehicle_code as motherTray,
m.productDescription,
m.supplierName
m.supplierName,
m.ingotBatch
FROM
sch_base_point p
LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.PalletSN
@@ -30,6 +31,9 @@
<if test="query.region_code != null">
and p.region_code = #{query.region_code}
</if>
<if test="query.ingotBatch != null">
and m.ingotBatch like CONCAT('%', #{query.ingotBatch}, '%')
</if>
ORDER BY point_code ASC
</select>
@@ -43,12 +47,7 @@
p.vehicle_code2 as subTray,
p.vehicle_code as motherTray,
p.update_time as updateTime,
m.siliconGrade,
m.productDescription,
m.supplierName,
m.ingotBatch,
m.incomingLength,
m.incomingWeight
m.*
FROM
sch_base_point p,sch_base_material m
WHERE
@@ -70,6 +69,9 @@
<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 point_code ASC
</select>
@@ -116,6 +118,9 @@
<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 pointCode ASC

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java
View File

@@ -22,4 +22,8 @@ public class ReportDto implements Serializable {
private String productDescription;
/** 供应商名称 */
private String supplierName;
/**
* 客户来料批次号
*/
private String ingotBatch;
}

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java
View File

@@ -24,4 +24,9 @@ public class ReportQuery implements Serializable {
private String point_code;
private String region_code;
private String ingotBatch;
private String start_point;
private String end_point;
}

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

@@ -7,32 +7,84 @@ 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 siliconGrade;
/** 客户来料批次号 */
/**
* 客户来料批次号
*/
private String ingotBatch;
/** 晶棒号 */
/**
* 晶棒号
*/
private String lotSN;
/** 来料长度 */
/**
* 来料长度
*/
private String incomingLength;
/** 来料重量 */
/**
* 来料重量
*/
private String incomingWeight;
/**
* 物料编码
*/
private String productName;
/**
* 来料缺陷长度
*/
private String incomingchipping;
/**
* 拼棒类型
*/
private String planZBNum;
/**
* 极性
*/
private String siliconPolarity;
/**
* 重量折算系数
*/
private String weightCoefficientValue;
/**
* 线径
*/
private String lineDiameter;
}

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

@@ -122,5 +122,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
return reportMapper.getLotSNList();
}
public List<String> getIngotBatchList(){
return reportMapper.getIngotBatchList();
}
}

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

@@ -291,7 +291,6 @@ public class YCLCKTask extends AbstractTask {
materialDataDto.setProductName(material.getProductName());
materialDataDto.setSpecification(material.getSpecification());
materialDataDto.setPickingBatch(extGroupData.getString("batch"));
materialDataDto.setBarLevel(material.getBarLevel());
materialDataDto.setLength(BigDecimal.valueOf(length));
materialDataDto.setWeight(BigDecimal.valueOf(weight));
materialDataDto.setCreateTime(new DateTime().toTimestamp());

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

@@ -268,7 +268,6 @@ public class YCLRKTask extends AbstractTask {
materialDataDto.setProductName(material.getProductName());
materialDataDto.setSpecification(material.getSpecification());
materialDataDto.setBatch(material.getBatch());
materialDataDto.setBarLevel(material.getBarLevel());
materialDataDto.setLength(BigDecimal.valueOf(length));
materialDataDto.setWeight(BigDecimal.valueOf(weight));
materialDataDto.setCreateTime(new DateTime().toTimestamp());