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

add:统计分析质量检测分析;足盘模糊查询

Browse Source
This commit is contained in:
zhangzhiqiang
2023-10-11 19:40:55 +08:00
parent 1954538af6
commit 5252da91e8
16 changed files with 434 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/qlmanage/controller/QualityController.java
View File

@@ -21,6 +21,8 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.MapOf;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.analysis_manage.qlmanage.dto.QualityQuery;
import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService;
import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure;
@@ -47,6 +49,8 @@ public class QualityController {
private IPdmProduceWorkorderService workorderService;
@Autowired
private IPdmBiWorkprocedureService workprocedureService;
@Autowired
private IPdmBiDeviceService deviceService;
@GetMapping()
@Log("查询质量分析")
@@ -186,4 +190,95 @@ public class QualityController {
}
@GetMapping("/bydevice")
@Log("查询质量分析")
public ResponseEntity<Object> bydevice(QualityQuery query, PageQuery page) {
long between = 30;
between = checkDateLimit(query, between);
QueryWrapper<PdmBiDevice> wrapper = new QueryWrapper<>();
wrapper.eq("workprocedure_id",query.getWorkprocedure_id());
Page<Map<String, Object>> page1 = deviceService.pageMaps(page.build(PdmBiDevice.class), wrapper);
String collect = page1.getRecords().stream().map(a->String.valueOf(a.get("device_code"))).collect(Collectors.joining("','"));
query.setDevice_code("('"+collect+"')");
List<Map> list = workorderService.qualityAnaByDevice(query);
if (!CollectionUtils.isEmpty(list)){
System.out.println("有数据了！！！！"+list.size());
}
Map<String, List<Map>> device_codeMap = list.stream().collect(Collectors.groupingBy(map -> String.valueOf(map.get("device_code"))));
//数据封装
List<Map<String,Object>> result = new ArrayList<>();
String time = query.getStart_time();
String mo =DatePattern.NORM_MONTH_FORMAT.format(DateUtil.parse(query.getStart_time()));
int minWeek = DateUtil.weekOfYear(DateUtil.parse(query.getStart_time()));
int minYear = DateUtil.year(DateUtil.parse(query.getStart_time()));
for (Map record : page1.getRecords()) {
Map<String, Object> item = new HashMap<>();
List<Map> maps = device_codeMap.get(record.get("device_code"));
item.put("device_code",record.get("device_code"));
item.put("device_name",record.get("device_name"));
item.put("product_area",record.get("product_area"));
Map<String, Map> collectByAnalysis = new HashMap<>();
if (!CollectionUtils.isEmpty(maps)){
collectByAnalysis = maps.stream().collect(HashMap::new, (k, v) -> k.put(String.valueOf(v.get(query.getAnalysis())), v), HashMap::putAll);
}else {
maps = new ArrayList<>();
}
String weektime = minYear+"_"+minWeek;
String motime = mo;
String datetime = time;
for (int i = 1; i <= between; i++) {
switch (query.getAnalysis()){
case "1":
Map itemData = collectByAnalysis.get(datetime);
if (itemData==null){
maps.add(MapOf.of("order_count", "0", "plan_qty", "0", "real_qty", "0", "nok_qty", "0","nok_rate",0,"header",datetime,"sort",i));
}else {
itemData.put("sort",i);
itemData.put("header",datetime);
}
datetime = DatePattern.NORM_DATE_FORMAT.format(DateUtil.offset(DateUtil.parse(query.getStart_time()),DateField.DAY_OF_MONTH,i));
break;
case "2":
Map weekData = collectByAnalysis.get(weektime);
if (weekData==null){
maps.add(MapOf.of("order_count", "0", "plan_qty", "0", "real_qty", "0", "nok_qty", "0","nok_rate",0,"header",weektime,"sort",i));
}else {
weekData.put("sort",i);
weekData.put("header",weektime);
}
DateTime offset = DateUtil.offset(DateUtil.parse(query.getStart_time()), DateField.WEEK_OF_YEAR, i);
weektime = DateUtil.year(offset)+"_"+DateUtil.weekOfYear(offset);
break;
case "3":
Map moDAta = collectByAnalysis.get(motime);
if (moDAta==null){
maps.add(MapOf.of("order_count", "0", "plan_qty", "0", "real_qty", "0", "nok_qty", "0","nok_rate",0,"header",motime,"sort",i));
}else {
moDAta.put("header",motime);
moDAta.put("sort",i);
}
motime = DatePattern.NORM_MONTH_FORMAT.format(DateUtil.offset(DateUtil.parse(query.getStart_time()),DateField.MONTH,i));
break;
default:throw new BadRequestException("统计周期未定义");
}
}
maps.removeIf(map -> map.get("sort")==null);
maps.sort(Comparator.comparing(a->(int)a.get("sort")));
item.put("item",maps);
item.put("viewData",maps.stream().map(a->a.get("nok_rate")).collect(Collectors.toList()));
item.put("header",maps.stream().map(a->a.get("header")).collect(Collectors.toList()));
item.put("total_real_qty",maps.stream().mapToLong(a->Long.valueOf(String.valueOf(a.get("real_qty")))).sum());
item.put("total_nok_qty",maps.stream().mapToLong(a->Long.valueOf(String.valueOf(a.get("nok_qty")))).sum());
item.put("total_order_count",maps.stream().mapToLong(a->Long.valueOf(String.valueOf(a.get("order_count")))).sum());
result.add(item);
}
page1.setRecords(result);
System.out.println(list.size());
return new ResponseEntity<>(TableDataInfo.build(page1), HttpStatus.OK);
}
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/qlmanage/dto/QualityQuery.java
View File

@@ -19,6 +19,10 @@ public class QualityQuery {
* 工序id
*/
private String workprocedure_id;
/**
* 设备编号
*/
private String device_code;
/**
* 车间
*/

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java
View File

@@ -39,5 +39,5 @@ public interface IMdPbBucketrecordService extends IService<MdPbBucketrecord> {
*/
void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response);
List<Map> getMstList(String storagevehicle_code);
List<Map> getMstList(String storagevehicle_code,String sale_code);
}

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketrecordMapper.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -18,5 +19,5 @@ public interface MdPbBucketrecordMapper extends BaseMapper<MdPbBucketrecord> {
List<Map> queryAll(Map<String,Object> map);
List<Map> getMstList(String storagevehicle_code);
List<Map> getMstList(@Param("storagevehicle_code") String storagevehicle_code,@Param("sale_code") String sale_code);
}

11
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketrecordMapper.xml
View File

@@ -16,7 +16,7 @@
and ma.material_id = #{material_id}
</if>
<if test="sale_code != null and sale_code != ''">
and re.sale_code like '${sale_code}%'
and re.sale_code like '%${sale_code}%'
</if>
<if test="storagevehicle_type != null and storagevehicle_type != ''">
and re.storagevehicle_type = #{storagevehicle_type}
@@ -25,10 +25,10 @@
and re.status = #{status}
</if>
<if test="storagevehicle_code != null and storagevehicle_code != ''">
and re.storagevehicle_code like '${storagevehicle_code}%'
and re.storagevehicle_code like '%${storagevehicle_code}%'
</if>
<if test="bucketunique != null and bucketunique != ''">
and ( re.bucketunique like '${bucketunique}%' )
and ( re.bucketunique like '%${bucketunique}%' )
</if>
order by re.create_time DESC
@@ -39,7 +39,10 @@
from md_pb_bucketrecord,(select @rowcount := 0) as r
where status = '1'
<if test="storagevehicle_code != null and storagevehicle_code != ''">
and storagevehicle_code like '${storagevehicle_code}%'
and storagevehicle_code like '%${storagevehicle_code}%'
</if>
<if test="sale_code != null and sale_code != ''">
and sale_code like '%${sale_code}%'
</if>
GROUP BY storagevehicle_code,sale_code,create_time
</select>

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java
View File

@@ -278,7 +278,7 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl<MdPbBucketrecordMap
}
@Override
public List<Map> getMstList(String storagevehicle_code) {
return this.baseMapper.getMstList(storagevehicle_code);
public List<Map> getMstList(String storagevehicle_code,String sale_code) {
return this.baseMapper.getMstList(storagevehicle_code,sale_code);
}
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java
View File

@@ -92,13 +92,13 @@ public class PdaProductIosController {
}
@PostMapping("/bucket")
@Log("根据订单获取订单物料信息")
@Log("查询订单组盘记录")
//("根据订单获取订单物料信息")
public ResponseEntity<Object> bucket(@RequestBody JSONObject param) {
String storagevehicleCode = param.getString("storagevehicle_code");
List mstList= new ArrayList<>();
if (param.getString("sale_code")!=null){
mstList = bucketrecordService.getMstList(storagevehicleCode);
mstList = bucketrecordService.getMstList(storagevehicleCode,param.getString("sale_code"));
}else {
List<Map<String, Object>> maps = bucketrecordService.listMaps(new QueryWrapper<MdPbBucketrecord>()
.eq("storagevehicle_code", storagevehicleCode).eq("status", "1"));

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
View File

@@ -180,12 +180,19 @@ public interface IPdmProduceWorkorderService extends IService<PdmProduceWorkorde
List<Map> productCap(ProductCapQuery query);
/**
* 不合格品分析
* 车间质量统计分析
* @param query
* @return
*/
List<Map> qualityAna(QualityQuery query);
/**
* 车间工序质量统计分析
* @param query
* @return
*/
List<Map> qualityAnaByDevice(QualityQuery query);
void download(Map map, HttpServletResponse response)
throws IOException;
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.java
View File

@@ -68,4 +68,6 @@ public interface PdmProduceWorkorderMapper extends BaseMapper<PdmProduceWorkorde
*/
List<Map> qualityAnalysis(QualityQuery query);
List<Map> qualityAnalysisByDevice(QualityQuery query);
}

40
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
View File

@@ -379,6 +379,46 @@
</otherwise>
</choose>
</select>
<select id="qualityAnalysisByDevice" resultType="java.util.Map">
select COUNT(pdm_produce_workorder.workprocedure_id) order_count,
pdm_produce_workorder.device_code,
pdm_produce_workorder.workprocedure_id,
YEAR(pdm_produce_workorder.create_time) '4',
DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m') '3',
CONCAT(YEAR(pdm_produce_workorder.create_time),"_",WEEK(pdm_produce_workorder.create_time)) '2',
DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m-%d') '1',
sum(plan_qty) plan_qty,
SUM(real_qty) real_qty,
SUM(nok_qty) nok_qty,
IF( SUM(real_qty) > 0, sum( nok_qty )*100 / sum( real_qty ), 0 ) AS nok_rate
from pdm_produce_workorder
LEFT JOIN pdm_bi_workprocedure ON pdm_bi_workprocedure.workprocedure_id = pdm_produce_workorder.workprocedure_id
where workorder_status in ('6','7') and pdm_produce_workorder.workprocedure_id = #{workprocedure_id}
<if test="device_code != null and device_code != ''">
and pdm_produce_workorder.device_code in ${device_code}
</if>
<if test="start_time != null and start_time != ''">
and pdm_produce_workorder.create_time >= #{start_time}
</if>
<if test="product_area != null and product_area != ''">
and pdm_produce_workorder.product_area >= #{product_area}
</if>
<if test="end_time != null and end_time != ''">
and #{end_time} >= pdm_produce_workorder.create_time
</if>
GROUP BY pdm_produce_workorder.device_code
<choose>
<when test='analysis == "2"'>
,CONCAT(YEAR(pdm_produce_workorder.create_time),"_",WEEK(pdm_produce_workorder.create_time))
</when>
<when test='analysis == "3"'>
,DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m')
</when>
<otherwise>
,DATE(pdm_produce_workorder.create_time)
</otherwise>
</choose>
</select>
</mapper>

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
View File

@@ -898,4 +898,10 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
List<Map> maps = this.baseMapper.qualityAnalysis(query);
return maps;
}
@Override
public List<Map> qualityAnaByDevice(QualityQuery query) {
List<Map> maps = this.baseMapper.qualityAnalysisByDevice(query);
return maps;
}
}

3
mes/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -19,7 +19,7 @@ https://juejin.cn/post/6844903775631572999
<!--引入默认的一些设置-->
<!-- <include resource="log/AutoCreateInst.xml"/>-->
<appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
<url>http://192.168.46.225:9200/_bulk</url>
<url>http://127.0.0.1:9200/_bulk</url>
<index>${esIndex}</index>
<type>mes_log</type>
<loggerName>es-logger</loggerName> <!-- optional -->
@@ -148,6 +148,7 @@ https://juejin.cn/post/6844903775631572999
<springProfile name="dev3">
<root level="debug">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="esLogAppender"/>
</root>
<logger name="jdbc.audit" level="ERROR" additivity="false">