Merge remote-tracking branch 'origin/master'
commit
87715ec818
@ -0,0 +1,117 @@
|
||||
package org.dromara.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo;
|
||||
import org.dromara.mes.domain.bo.ProdBaseMachineProcessBo;
|
||||
import org.dromara.mes.service.IProdBaseMachineProcessService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 机台关联工序
|
||||
* 前端访问路由地址为:/mes/baseMachineProcess
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/baseMachineProcess")
|
||||
public class ProdBaseMachineProcessController extends BaseController {
|
||||
|
||||
private final IProdBaseMachineProcessService prodBaseMachineProcessService;
|
||||
|
||||
/**
|
||||
* 查询机台关联工序列表
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ProdBaseMachineProcessVo> list(ProdBaseMachineProcessBo bo, PageQuery pageQuery) {
|
||||
return prodBaseMachineProcessService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出机台关联工序列表
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:export")
|
||||
@Log(title = "机台关联工序", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ProdBaseMachineProcessBo bo, HttpServletResponse response) {
|
||||
List<ProdBaseMachineProcessVo> list = prodBaseMachineProcessService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "机台关联工序", ProdBaseMachineProcessVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取机台关联工序详细信息
|
||||
*
|
||||
* @param machineId 主键
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:query")
|
||||
@GetMapping("/{machineId}")
|
||||
public R<ProdBaseMachineProcessVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long machineId) {
|
||||
return R.ok(prodBaseMachineProcessService.queryById(machineId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增机台关联工序
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:add")
|
||||
@Log(title = "机台关联工序", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdBaseMachineProcessBo bo) {
|
||||
return toAjax(prodBaseMachineProcessService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改机台关联工序
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:edit")
|
||||
@Log(title = "机台关联工序", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseMachineProcessBo bo) {
|
||||
return toAjax(prodBaseMachineProcessService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除机台关联工序
|
||||
*
|
||||
* @param machineIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:remove")
|
||||
@Log(title = "机台关联工序", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{machineIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] machineIds) {
|
||||
return toAjax(prodBaseMachineProcessService.deleteWithValidByIds(List.of(machineIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询机台关联工序列表
|
||||
*/
|
||||
|
||||
@GetMapping("/getProdBaseMachineProcessList")
|
||||
public R<List<ProdBaseMachineProcessVo>> getProdBaseMachineProcessList(ProdBaseMachineProcessBo bo) {
|
||||
List<ProdBaseMachineProcessVo> list = prodBaseMachineProcessService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,80 @@
|
||||
package org.dromara.mes.controller;
|
||||
|
||||
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.mes.domain.vo.*;
|
||||
import org.dromara.mes.service.IProdReportService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* MES生产报表Controller
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-27
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/prodReport")
|
||||
public class ProdReportController extends BaseController {
|
||||
|
||||
private final IProdReportService prodReportService;
|
||||
|
||||
/**
|
||||
* 生产计划完成率报表
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/planCompletionRateReport")
|
||||
public TableDataInfo<PlanCompletionRateReportVo> planCompletionRateReportList(@RequestParam(required = false) Map hashMap, PageQuery pageQuery) {
|
||||
return prodReportService.planCompletionRateReportVoList(hashMap, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生产计划完成率报表导出
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/planCompletionRateReport/export")
|
||||
public void planCompletionRateReportListExport(@RequestParam(required = false) Map hashMap, HttpServletResponse response) {
|
||||
List<PlanCompletionRateReportVo> list = prodReportService.planCompletionRateReportVoList(hashMap);
|
||||
ExcelUtil.exportExcel(list, "生产计划完成率报表", PlanCompletionRateReportVo.class, response);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/planCompletionContrastReport")
|
||||
public TableDataInfo<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(@RequestParam(required = false) Map hashMap, PageQuery pageQuery) {
|
||||
return prodReportService.planCompletionContrastReportVoList(hashMap, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表导出
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/planCompletionContrastReport/export")
|
||||
public void planCompletionContrastReportExport(@RequestParam(required = false) Map hashMap, HttpServletResponse response) {
|
||||
List<PlanCompletionContrastReportVo> list = prodReportService.planCompletionContrastReportVoList(hashMap);
|
||||
ExcelUtil.exportExcel(list, "生产计划完成率对比报表", PlanCompletionContrastReportVo.class, response);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package org.dromara.mes.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 机台关联工序对象 prod_base_machine_process
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@Data
|
||||
@TableName("prod_base_machine_process")
|
||||
public class ProdBaseMachineProcess extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 工序ID
|
||||
*/
|
||||
private Long processId;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Long updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Date updateTime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package org.dromara.mes.domain.bo;
|
||||
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 机台关联工序业务对象 prod_base_machine_process
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = ProdBaseMachineProcess.class, reverseConvertGenerate = false)
|
||||
public class ProdBaseMachineProcessBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
@NotNull(message = "机台ID不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 工序ID
|
||||
*/
|
||||
@NotNull(message = "工序ID不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private Long processId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,103 @@
|
||||
package org.dromara.mes.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-28
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class PlanCompletionContrastReportVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
@ExcelProperty(value = "物料名称")
|
||||
private String materialName;
|
||||
|
||||
/**
|
||||
* 当日计划
|
||||
*/
|
||||
@ExcelProperty(value = "当日计划")
|
||||
private BigDecimal dayPlanNumber;
|
||||
|
||||
/**
|
||||
* 当日实际
|
||||
*/
|
||||
@ExcelProperty(value = "当日实际")
|
||||
private BigDecimal dayActualNumber;
|
||||
|
||||
/**
|
||||
* 当日差异
|
||||
*/
|
||||
@ExcelProperty(value = "当日差异")
|
||||
private BigDecimal dayDeviationNumber;
|
||||
|
||||
/**
|
||||
* 日完成率
|
||||
*/
|
||||
@ExcelProperty(value = "日完成率")
|
||||
private String dayCompletionRate;
|
||||
|
||||
/**
|
||||
* 当月计划
|
||||
*/
|
||||
@ExcelProperty(value = "当月计划")
|
||||
private BigDecimal monthPlanNumber;
|
||||
|
||||
/**
|
||||
* 当月实际
|
||||
*/
|
||||
@ExcelProperty(value = "当月实际")
|
||||
private BigDecimal monthActualNumber;
|
||||
|
||||
/**
|
||||
* 当月差异
|
||||
*/
|
||||
@ExcelProperty(value = "当月差异")
|
||||
private BigDecimal monthDeviationNumber;
|
||||
|
||||
/**
|
||||
* 月完成率
|
||||
*/
|
||||
@ExcelProperty(value = "月完成率")
|
||||
private String monthCompletionRate;
|
||||
|
||||
/**
|
||||
* 当年计划
|
||||
*/
|
||||
@ExcelProperty(value = "当年计划")
|
||||
private BigDecimal yearPlanNumber;
|
||||
|
||||
/**
|
||||
* 当年实际
|
||||
*/
|
||||
@ExcelProperty(value = "当年实际")
|
||||
private BigDecimal yearActualNumber;
|
||||
|
||||
/**
|
||||
* 当年差异
|
||||
*/
|
||||
@ExcelProperty(value = "当年差异")
|
||||
private BigDecimal yearDeviationNumber;
|
||||
|
||||
/**
|
||||
* 年完成率
|
||||
*/
|
||||
@ExcelProperty(value = "年完成率")
|
||||
private String yearCompletionRate;
|
||||
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package org.dromara.mes.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
|
||||
/**
|
||||
* 生产计划完成率
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-28
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class PlanCompletionRateReportVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
@ExcelProperty(value = "物料名称")
|
||||
private String materialName;
|
||||
|
||||
/**
|
||||
* 计划数
|
||||
*/
|
||||
@ExcelProperty(value = "计划数")
|
||||
private BigDecimal planNumber;
|
||||
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
@ExcelProperty(value = "实际数量")
|
||||
private BigDecimal actualNumber;
|
||||
|
||||
/**
|
||||
* 偏差数
|
||||
*/
|
||||
@ExcelProperty(value = "偏差数")
|
||||
private BigDecimal deviationNumber;
|
||||
|
||||
/**
|
||||
* 完成率
|
||||
*/
|
||||
@ExcelProperty(value = "完成率")
|
||||
private String completionRate;
|
||||
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package org.dromara.mes.domain.vo;
|
||||
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 机台关联工序视图对象 prod_base_machine_process
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = ProdBaseMachineProcess.class)
|
||||
public class ProdBaseMachineProcessVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
@ExcelProperty(value = "机台ID")
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 工序ID
|
||||
*/
|
||||
@ExcelProperty(value = "工序ID")
|
||||
private Long processId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.mes.mapper;
|
||||
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 机台关联工序Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
public interface ProdBaseMachineProcessMapper extends BaseMapperPlus<ProdBaseMachineProcess, ProdBaseMachineProcessVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
package org.dromara.mes.mapper;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.mes.domain.vo.PlanCompletionContrastReportVo;
|
||||
import org.dromara.mes.domain.vo.PlanCompletionRateReportVo;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* MES生产报表Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-27
|
||||
*/
|
||||
public interface ProdReportMapper {
|
||||
|
||||
/**
|
||||
* 生产计划完成率报表
|
||||
*
|
||||
* @param hashMap
|
||||
* @param page
|
||||
* @param tableName
|
||||
* @return
|
||||
*/
|
||||
Page<PlanCompletionRateReportVo> planCompletionRateReportVoList(@Param("map") Map hashMap, @Param("page") Page<PlanCompletionRateReportVo> page, @Param("tableName") String tableName);
|
||||
|
||||
/**
|
||||
* 生产计划完成率报表导出
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
List<PlanCompletionRateReportVo> planCompletionRateReportVoList(@Param("map") Map hashMap, @Param("tableName") String tableName);
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表
|
||||
*
|
||||
* @param hashMap
|
||||
* @param page
|
||||
* @param tableName
|
||||
* @return
|
||||
*/
|
||||
Page<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(@Param("map") Map hashMap, @Param("page") Page<PlanCompletionContrastReportVo> page, @Param("tableName") String tableName);
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表导出
|
||||
*
|
||||
* @param hashMap
|
||||
* @param tableName
|
||||
* @return
|
||||
*/
|
||||
List<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(@Param("map") Map hashMap, @Param("tableName") String tableName);
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.mes.service;
|
||||
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo;
|
||||
import org.dromara.mes.domain.bo.ProdBaseMachineProcessBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 机台关联工序Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
public interface IProdBaseMachineProcessService {
|
||||
|
||||
/**
|
||||
* 查询机台关联工序
|
||||
*
|
||||
* @param machineId 主键
|
||||
* @return 机台关联工序
|
||||
*/
|
||||
ProdBaseMachineProcessVo queryById(Long machineId);
|
||||
|
||||
/**
|
||||
* 分页查询机台关联工序列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 机台关联工序分页列表
|
||||
*/
|
||||
TableDataInfo<ProdBaseMachineProcessVo> queryPageList(ProdBaseMachineProcessBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的机台关联工序列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 机台关联工序列表
|
||||
*/
|
||||
List<ProdBaseMachineProcessVo> queryList(ProdBaseMachineProcessBo bo);
|
||||
|
||||
/**
|
||||
* 新增机台关联工序
|
||||
*
|
||||
* @param bo 机台关联工序
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ProdBaseMachineProcessBo bo);
|
||||
|
||||
/**
|
||||
* 修改机台关联工序
|
||||
*
|
||||
* @param bo 机台关联工序
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ProdBaseMachineProcessBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除机台关联工序信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package org.dromara.mes.service;
|
||||
|
||||
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.mes.domain.vo.PlanCompletionContrastReportVo;
|
||||
import org.dromara.mes.domain.vo.PlanCompletionRateReportVo;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* MES生产报表Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-27
|
||||
*/
|
||||
public interface IProdReportService {
|
||||
|
||||
/**
|
||||
* 生产计划完成率报表
|
||||
*
|
||||
* @param hashMap
|
||||
* @param pageQuery
|
||||
* @return
|
||||
*/
|
||||
TableDataInfo<PlanCompletionRateReportVo> planCompletionRateReportVoList(Map hashMap, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 生产计划完成率报表导出
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
List<PlanCompletionRateReportVo> planCompletionRateReportVoList(Map hashMap);
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表
|
||||
* @param hashMap
|
||||
* @param pageQuery
|
||||
* @return
|
||||
*/
|
||||
TableDataInfo<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(Map hashMap, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表导出
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
List<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(Map hashMap);
|
||||
}
|
||||
@ -0,0 +1,133 @@
|
||||
package org.dromara.mes.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.mes.domain.bo.ProdBaseMachineProcessBo;
|
||||
import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo;
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import org.dromara.mes.mapper.ProdBaseMachineProcessMapper;
|
||||
import org.dromara.mes.service.IProdBaseMachineProcessService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 机台关联工序Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ProdBaseMachineProcessServiceImpl implements IProdBaseMachineProcessService {
|
||||
|
||||
private final ProdBaseMachineProcessMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询机台关联工序
|
||||
*
|
||||
* @param machineId 主键
|
||||
* @return 机台关联工序
|
||||
*/
|
||||
@Override
|
||||
public ProdBaseMachineProcessVo queryById(Long machineId){
|
||||
return baseMapper.selectVoById(machineId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询机台关联工序列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 机台关联工序分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ProdBaseMachineProcessVo> queryPageList(ProdBaseMachineProcessBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ProdBaseMachineProcess> lqw = buildQueryWrapper(bo);
|
||||
Page<ProdBaseMachineProcessVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的机台关联工序列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 机台关联工序列表
|
||||
*/
|
||||
@Override
|
||||
public List<ProdBaseMachineProcessVo> queryList(ProdBaseMachineProcessBo bo) {
|
||||
MPJLambdaWrapper<ProdBaseMachineProcess> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ProdBaseMachineProcess> buildQueryWrapper(ProdBaseMachineProcessBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ProdBaseMachineProcess> lqw = JoinWrappers.lambda(ProdBaseMachineProcess.class)
|
||||
.selectAll(ProdBaseMachineProcess.class)
|
||||
.eq(bo.getMachineId() != null, ProdBaseMachineProcess::getMachineId, bo.getMachineId())
|
||||
.eq(bo.getProcessId() != null, ProdBaseMachineProcess::getProcessId, bo.getProcessId())
|
||||
.orderByDesc(ProdBaseMachineProcess::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增机台关联工序
|
||||
*
|
||||
* @param bo 机台关联工序
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ProdBaseMachineProcessBo bo) {
|
||||
ProdBaseMachineProcess add = MapstructUtils.convert(bo, ProdBaseMachineProcess.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setMachineId(add.getMachineId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改机台关联工序
|
||||
*
|
||||
* @param bo 机台关联工序
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ProdBaseMachineProcessBo bo) {
|
||||
ProdBaseMachineProcess update = MapstructUtils.convert(bo, ProdBaseMachineProcess.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ProdBaseMachineProcess entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除机台关联工序信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,100 @@
|
||||
package org.dromara.mes.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.constant.DatabaseConstants;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.mes.domain.vo.PlanCompletionContrastReportVo;
|
||||
import org.dromara.mes.domain.vo.PlanCompletionRateReportVo;
|
||||
import org.dromara.mes.mapper.ProdReportMapper;
|
||||
import org.dromara.mes.service.IProdReportService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* MES生产报表Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-27
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ProdReportServiceImpl implements IProdReportService {
|
||||
|
||||
private final ProdReportMapper prodReportMapper;
|
||||
|
||||
/**
|
||||
* 生产计划完成率报表
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<PlanCompletionRateReportVo> planCompletionRateReportVoList(Map hashMap, PageQuery pageQuery) {
|
||||
String tableName = getPlanInfoTableNameByProcessId(Long.parseLong(String.valueOf(hashMap.get("processId"))));
|
||||
Page<PlanCompletionRateReportVo> page = prodReportMapper.planCompletionRateReportVoList(hashMap, pageQuery.build(), tableName);
|
||||
return TableDataInfo.build(page);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生产计划完成率报表导出
|
||||
*
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<PlanCompletionRateReportVo> planCompletionRateReportVoList(Map hashMap) {
|
||||
String tableName = getPlanInfoTableNameByProcessId(Long.parseLong(String.valueOf(hashMap.get("processId"))));
|
||||
return prodReportMapper.planCompletionRateReportVoList(hashMap, tableName);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据工序获取获取生产计划数据库表名
|
||||
*
|
||||
* @param processId 工序ID
|
||||
* @return 生产计划数据库表名
|
||||
*/
|
||||
public String getPlanInfoTableNameByProcessId(Long processId) {
|
||||
String tableName = null;
|
||||
if (StringUtils.isNull(processId)) {
|
||||
return null;
|
||||
}
|
||||
if (processId == 17L) {
|
||||
tableName = DatabaseConstants.TABLE_NAME_PROD_PLAN_INFO_PREFIX + "_3";
|
||||
} else if (processId == 18L) {
|
||||
tableName = DatabaseConstants.TABLE_NAME_PROD_PLAN_INFO_PREFIX + "_4";
|
||||
} else {
|
||||
tableName = DatabaseConstants.TABLE_NAME_PROD_PLAN_INFO_PREFIX + "_2";
|
||||
}
|
||||
return tableName;
|
||||
}
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表
|
||||
* @param hashMap
|
||||
* @param pageQuery
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(Map hashMap, PageQuery pageQuery) {
|
||||
String tableName = getPlanInfoTableNameByProcessId(Long.parseLong(String.valueOf(hashMap.get("processId"))));
|
||||
Page<PlanCompletionContrastReportVo> page = prodReportMapper.planCompletionContrastReportVoList(hashMap, pageQuery.build(), tableName);
|
||||
return TableDataInfo.build(page);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生产计划完成率对比报表导出
|
||||
* @param hashMap
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(Map hashMap) {
|
||||
String tableName = getPlanInfoTableNameByProcessId(Long.parseLong(String.valueOf(hashMap.get("processId"))));
|
||||
return prodReportMapper.planCompletionContrastReportVoList(hashMap, tableName);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.mes.mapper.ProdBaseMachineProcessMapper">
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,107 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.mes.mapper.ProdReportMapper">
|
||||
|
||||
<select id="planCompletionRateReportVoList" resultType="org.dromara.mes.domain.vo.PlanCompletionRateReportVo">
|
||||
SELECT bmi.material_name materialName,
|
||||
CAST(SUM(t.plan_amount) AS DECIMAL(10, 2)) planNumber,
|
||||
CAST(SUM(t.complete_amount) AS DECIMAL(10, 2)) actualNumber,
|
||||
CAST(SUM(t.complete_amount - t.plan_amount) AS DECIMAL(10, 2)) deviationNumber,
|
||||
CONCAT(CAST((SUM(t.complete_amount) / SUM(t.plan_amount))
|
||||
* 100 AS DECIMAL(10, 2)), '%') completionRate
|
||||
FROM ${tableName} t
|
||||
LEFT JOIN base_material_info bmi on bmi.material_id = t.material_id
|
||||
<where>
|
||||
<if test="map.beginDate != null and map.beginDate != '' and map.endDate != null and map.endDate != ''">
|
||||
AND FORMAT(t.plan_begin_time, 'yyyy-MM-dd') BETWEEN #{map.beginDate} AND #{map.endDate}
|
||||
</if>
|
||||
<if test="map.processId != null and map.processId != ''">
|
||||
AND t.process_id = #{map.processId}
|
||||
</if>
|
||||
<if test="map.machineId != null and map.machineId != ''">
|
||||
AND t.release_id = #{map.machineId}
|
||||
</if>
|
||||
<if test="map.shiftId != null and map.shiftId != ''">
|
||||
AND t.shift_id = #{map.shiftId}
|
||||
</if>
|
||||
<if test="map.classTeamId != null and map.classTeamId != ''">
|
||||
AND t.class_team_id = #{map.classTeamId}
|
||||
</if>
|
||||
<if test="map.planCode != null and map.planCode != ''">
|
||||
AND t.plan_code LIKE CONCAT('%', #{map.planCode}, '%')
|
||||
</if>
|
||||
<if test="map.materialName != null and map.materialName != ''">
|
||||
AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%')
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY bmi.material_name
|
||||
ORDER BY materialName
|
||||
</select>
|
||||
|
||||
<select id="planCompletionContrastReportVoList"
|
||||
resultType="org.dromara.mes.domain.vo.PlanCompletionContrastReportVo">
|
||||
WITH aggregated_data AS (SELECT t.tenant_id, bmi.material_name AS materialName,
|
||||
SUM(IIF(FORMAT(t.plan_begin_time, 'yyyy-MM-dd') = FORMAT(CAST(#{map.beginDate} AS DATETIME), 'yyyy-MM-dd'), t.plan_amount, 0)) AS
|
||||
dayPlanNumber,
|
||||
SUM(IIF(FORMAT(t.plan_begin_time, 'yyyy-MM-dd') = FORMAT(CAST(#{map.beginDate} AS DATETIME), 'yyyy-MM-dd'), t.complete_amount, 0))
|
||||
AS dayActualNumber,
|
||||
SUM(IIF(FORMAT(t.plan_begin_time, 'yyyy-MM') = FORMAT(CAST(#{map.beginDate} AS DATETIME), 'yyyy-MM'), t.plan_amount, 0)) AS
|
||||
monthPlanNumber,
|
||||
SUM(IIF(FORMAT(t.plan_begin_time, 'yyyy-MM') = FORMAT(CAST(#{map.beginDate} AS DATETIME), 'yyyy-MM'), t.complete_amount, 0)) AS
|
||||
monthActualNumber,
|
||||
SUM(IIF(FORMAT(t.plan_begin_time, 'yyyy') = FORMAT(CAST(#{map.beginDate} AS DATETIME), 'yyyy'), t.plan_amount, 0)) AS
|
||||
yearPlanNumber,
|
||||
SUM(IIF(FORMAT(t.plan_begin_time, 'yyyy') = FORMAT(CAST(#{map.beginDate} AS DATETIME), 'yyyy'), t.complete_amount, 0)) AS
|
||||
yearActualNumber
|
||||
FROM ${tableName} t
|
||||
LEFT JOIN base_material_info bmi ON bmi.material_id = t.material_id
|
||||
<where>
|
||||
<if test="map.beginDate != null and map.beginDate != ''">
|
||||
AND FORMAT(t.plan_begin_time, 'yyyy-MM-dd') BETWEEN #{map.beginDate} AND #{map.beginDate}
|
||||
</if>
|
||||
<if test="map.processId != null and map.processId != ''">
|
||||
AND t.process_id = #{map.processId}
|
||||
</if>
|
||||
<if test="map.machineId != null and map.machineId != ''">
|
||||
AND t.release_id = #{map.machineId}
|
||||
</if>
|
||||
<if test="map.shiftId != null and map.shiftId != ''">
|
||||
AND t.shift_id = #{map.shiftId}
|
||||
</if>
|
||||
<if test="map.classTeamId != null and map.classTeamId != ''">
|
||||
AND t.class_team_id = #{map.classTeamId}
|
||||
</if>
|
||||
<if test="map.planCode != null and map.planCode != ''">
|
||||
AND t.plan_code LIKE CONCAT('%', #{map.planCode}, '%')
|
||||
</if>
|
||||
<if test="map.materialName != null and map.materialName != ''">
|
||||
AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%')
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY t.tenant_id, bmi.material_name)
|
||||
SELECT materialName,
|
||||
-- 当天数据
|
||||
CAST(dayPlanNumber AS DECIMAL(10, 2)) AS dayPlanNumber,
|
||||
CAST(dayActualNumber AS DECIMAL(10, 2)) AS dayActualNumber,
|
||||
CAST(dayActualNumber - dayPlanNumber AS DECIMAL(10, 2)) AS dayDeviationNumber,
|
||||
CONCAT(CAST(IIF(dayPlanNumber = 0, 0, (dayActualNumber * 100.0 / dayPlanNumber)) AS DECIMAL(10, 2)),
|
||||
'%') AS dayCompletionRate,
|
||||
-- 当月数据
|
||||
CAST(monthPlanNumber AS DECIMAL(10, 2)) AS monthPlanNumber,
|
||||
CAST(monthActualNumber AS DECIMAL(10, 2)) AS monthActualNumber,
|
||||
CAST(monthActualNumber - monthPlanNumber AS DECIMAL(10, 2)) AS monthDeviationNumber,
|
||||
CONCAT(CAST(IIF(monthPlanNumber = 0, 0, (monthActualNumber * 100.0 / monthPlanNumber)) AS DECIMAL(10, 2)),
|
||||
'%') AS monthCompletionRate,
|
||||
-- 当年数据
|
||||
CAST(yearPlanNumber AS DECIMAL(10, 2)) AS yearPlanNumber,
|
||||
CAST(yearActualNumber AS DECIMAL(10, 2)) AS yearActualNumber,
|
||||
CAST(yearActualNumber - yearPlanNumber AS DECIMAL(10, 2)) AS yearDeviationNumber,
|
||||
CONCAT(CAST(IIF(yearPlanNumber = 0, 0, (yearActualNumber * 100.0 / yearPlanNumber)) AS DECIMAL(10, 2)),
|
||||
'%') AS yearCompletionRate
|
||||
FROM aggregated_data
|
||||
ORDER BY materialName
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue