hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -3,6 +3,7 @@ import cn.hutool.core.date.DateTime; import com.mes.damage.entity.Damage; import com.mes.damage.entity.DamagePrint; import com.mes.damage.service.DamageService; import com.mes.utils.Result; import io.swagger.annotations.Api; @@ -62,6 +63,18 @@ damageService.insertDamage(damage); return Result.build(200,"新增成功",1); } @ApiOperation("拿走数据查询") @PostMapping("/selectDamagePrint") public Result selectDamagePrint(@RequestBody Damage damage) { List<Damage> damage2=damageService.selectDamagePrint(damage); return Result.build(200,"查询成功",damage2); } @ApiOperation("拿走打印查询") @PostMapping("/selectDamagePrintDetails") public Result selectDamagePrintDetails(@RequestBody Damage damage) { List<DamagePrint> damage2=damageService.selectDamagePrintDetails(damage); return Result.build(200,"查询成功",damage2); } }
@@ -1,6 +1,7 @@ package com.mes.damage.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.github.yulichang.base.MPJBaseMapper; import com.mes.damage.entity.Damage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -13,6 +14,6 @@ * @since 2024-06-13 */ @DS("hangzhoumes") public interface DamageMapper extends BaseMapper<Damage> { public interface DamageMapper extends MPJBaseMapper<Damage> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -1,9 +1,12 @@ package com.mes.damage.service; import com.baomidou.mybatisplus.extension.service.IService; import com.github.yulichang.base.MPJBaseService; import com.mes.damage.entity.Damage; import com.mes.damage.entity.DamagePrint; import java.util.List; import java.util.Map; /** * <p> @@ -13,7 +16,7 @@ * @author wu * @since 2024-06-13 */ public interface DamageService extends IService<Damage> { public interface DamageService extends MPJBaseService<Damage> { List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure); @@ -32,4 +35,8 @@ * @param damageList */ void batchInsertDamage(List<Damage> damageList); List<Damage> selectDamagePrint(Damage damage); List<DamagePrint> selectDamagePrintDetails(Damage damage); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -1,8 +1,12 @@ package com.mes.damage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.query.MPJQueryWrapper; import com.mes.damage.entity.Damage; import com.mes.damage.entity.DamagePrint; import com.mes.damage.mapper.DamageMapper; import com.mes.damage.service.DamageService; import com.mes.glassinfo.entity.GlassInfo; @@ -10,11 +14,14 @@ import com.mes.work_assignment.entity.WorkAssignment; import com.mes.work_assignment.mapper.WorkAssignmentMapper; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -28,12 +35,14 @@ * @since 2024-06-13 */ @Service public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService { public class DamageServiceImpl extends MPJBaseServiceImpl<DamageMapper, Damage> implements DamageService { @Resource GlassInfoMapper glassInfoMapper; @Resource WorkAssignmentMapper workAssignmentMapper; @Autowired private DamageMapper damageMapper; /** * 查询报工信息 @@ -136,4 +145,29 @@ } this.saveBatch(damageList); } @Override public List<Damage> selectDamagePrint(Damage damage) { QueryWrapper<Damage> wrapper = new QueryWrapper<>(); wrapper.select("working_procedure,engineer_id,teams_groups_name,device_name,count(glass_id)as glass_id") .eq("type",damage.getType()) .eq("working_procedure",damage.getWorkingProcedure()) .groupBy("working_procedure,engineer_id,teams_groups_name,device_name"); if (damage.getEngineerId() != null) { wrapper.eq("engineer_id", damage.getEngineerId()); } return this.list(wrapper); } @Override public List<DamagePrint> selectDamagePrintDetails(Damage damage) { List<DamagePrint> listDamage=damageMapper.selectJoinList(DamagePrint.class,new MPJQueryWrapper<Damage>() .select("b.flow_card_id,b.layer,t.engineer_id,b.tempering_layout_id,b.tempering_feed_sequence,t.glass_id,b.width,b.height,b.thickness") .leftJoin("glass_info as b on t.glass_id=b.glass_id") .eq("t.working_procedure",damage.getWorkingProcedure()) .eq("t.type",damage.getType()) .eq("t.engineer_id",damage.getEngineerId()) ); return listDamage; } } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -52,7 +52,7 @@ String startOfPeriodStr = startOfPeriod.format(formatter); String endOfPeriodStr = endOfPeriod.format(formatter); // 设置为最近七天的时间范围 reportingdamage.setReportingWorkTime("2024-05-11" + " to " + endOfPeriodStr); reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr); //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr); //扇形图各设备的加工破损数量 List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
