forked from I3-YF/i3plus-mes-yfai
Merge remote-tracking branch 'origin/dev' into dev
jun
11 months ago
commit
29cc194ad7
@ -0,0 +1,34 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.busi.board;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardConditionModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardResultModel;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 看板-业务方法
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2024/6/19 11:08
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesYfBoardService {
|
||||
|
||||
/**
|
||||
* 产线看板
|
||||
*/
|
||||
List<MesWorkCenterBoardResultModel> queryWorkCenterStatus(MesWorkCenterBoardConditionModel conditionModel);
|
||||
|
||||
MesWorkCenterBoardResultModel queryWorkCenterProductionCompletionRate(MesWorkCenterBoardConditionModel conditionModel);
|
||||
|
||||
List<MesWorkCenterBoardResultModel> queryWorkCenterWorkOrderCompletionStatus(MesWorkCenterBoardConditionModel conditionModel);
|
||||
|
||||
List<MesWorkCenterBoardResultModel> queryUnitHourCompletionRate(MesWorkCenterBoardConditionModel conditionModel);
|
||||
|
||||
List<MesWorkCenterBoardResultModel> queryWorkCenterFirstTimeOfflineQualificationRate(MesWorkCenterBoardConditionModel conditionModel);
|
||||
|
||||
List<MesWorkCenterBoardResultModel> queryInspectionResults(MesWorkCenterBoardConditionModel conditionModel);
|
||||
|
||||
MesWorkCenterBoardResultModel queryAbnormalDowntime(MesWorkCenterBoardConditionModel conditionModel);
|
||||
|
||||
}
|
||||
@ -0,0 +1,160 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.board;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.board.IMesYfBoardService;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardConditionModel;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import cn.estsh.impp.framework.boot.util.ValidatorBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @Description : 产线看板
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2024/6/19 11:10
|
||||
* @Modify:
|
||||
**/
|
||||
@Api("产线看板")
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/work-center-board")
|
||||
public class MesWorkCenterBoardController {
|
||||
|
||||
@Autowired
|
||||
private IMesYfBoardService mesYfBoardService;
|
||||
|
||||
@ApiOperation(value = "查询产线状态", notes = "查询产线状态")
|
||||
@PostMapping("/query-work-center-status")
|
||||
public ResultBean queryWorkCenterStatus(MesWorkCenterBoardConditionModel conditionModel){
|
||||
try {
|
||||
ValidatorBean.beginValid(conditionModel)
|
||||
.notNull("workCenterCodeList", conditionModel.getWorkCenterCodeList())
|
||||
.notNull("timeRangeIdentification", conditionModel.getTimeRangeIdentification());
|
||||
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
conditionModel.setOrganizeCode(organizeCode);
|
||||
return ResultBean.success("查询产线状态").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).
|
||||
setResultList(mesYfBoardService.queryWorkCenterStatus(conditionModel));
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询产线生产完成率", notes = "查询产线生产完成率")
|
||||
@PostMapping("/query-work-center-production-completion-rate")
|
||||
public ResultBean queryWorkCenterProductionCompletionRate(MesWorkCenterBoardConditionModel conditionModel){
|
||||
try {
|
||||
ValidatorBean.beginValid(conditionModel)
|
||||
.notNull("workCenterCodeList", conditionModel.getWorkCenterCodeList())
|
||||
.notNull("timeRangeIdentification", conditionModel.getTimeRangeIdentification());
|
||||
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
conditionModel.setOrganizeCode(organizeCode);
|
||||
return ResultBean.success("查询产线生产完成率").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).
|
||||
setResultObject(mesYfBoardService.queryWorkCenterProductionCompletionRate(conditionModel));
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询产线工单完成情况", notes = "查询产线工单完成情况")
|
||||
@PostMapping("/query-work-center-work-order-completion-status")
|
||||
public ResultBean queryWorkCenterWorkOrderCompletionStatus(MesWorkCenterBoardConditionModel conditionModel){
|
||||
try {
|
||||
ValidatorBean.beginValid(conditionModel)
|
||||
.notNull("workCenterCodeList", conditionModel.getWorkCenterCodeList())
|
||||
.notNull("timeRangeIdentification", conditionModel.getTimeRangeIdentification());
|
||||
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
conditionModel.setOrganizeCode(organizeCode);
|
||||
return ResultBean.success("查询产线工单完成情况").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).
|
||||
setResultList(mesYfBoardService.queryWorkCenterWorkOrderCompletionStatus(conditionModel));
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询单位小时完工数", notes = "查询单位小时完工数")
|
||||
@PostMapping("/query-unit-hour-completion-rate")
|
||||
public ResultBean queryUnitHourCompletionRate(MesWorkCenterBoardConditionModel conditionModel){
|
||||
try {
|
||||
ValidatorBean.beginValid(conditionModel)
|
||||
.notNull("workCenterCodeList", conditionModel.getWorkCenterCodeList())
|
||||
.notNull("timeRangeIdentification", conditionModel.getTimeRangeIdentification());
|
||||
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
conditionModel.setOrganizeCode(organizeCode);
|
||||
return ResultBean.success("查询单位小时完工数").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).
|
||||
setResultList(mesYfBoardService.queryUnitHourCompletionRate(conditionModel));
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询产线一次下线合格率", notes = "查询产线一次下线合格率")
|
||||
@PostMapping("/query-work-center-first-time-offline-qualification-rate")
|
||||
public ResultBean queryWorkCenterFirstTimeOfflineQualificationRate(MesWorkCenterBoardConditionModel conditionModel){
|
||||
try {
|
||||
ValidatorBean.beginValid(conditionModel)
|
||||
.notNull("workCenterCodeList", conditionModel.getWorkCenterCodeList())
|
||||
.notNull("timeRangeIdentification", conditionModel.getTimeRangeIdentification());
|
||||
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
conditionModel.setOrganizeCode(organizeCode);
|
||||
return ResultBean.success("查询产线一次下线合格率").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).
|
||||
setResultList(mesYfBoardService.queryWorkCenterFirstTimeOfflineQualificationRate(conditionModel));
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询点检结果", notes = "查询点检结果")
|
||||
@PostMapping("/query-inspection-results")
|
||||
public ResultBean queryInspectionResults(MesWorkCenterBoardConditionModel conditionModel){
|
||||
try {
|
||||
ValidatorBean.beginValid(conditionModel)
|
||||
.notNull("workCenterCodeList", conditionModel.getWorkCenterCodeList())
|
||||
.notNull("timeRangeIdentification", conditionModel.getTimeRangeIdentification());
|
||||
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
conditionModel.setOrganizeCode(organizeCode);
|
||||
return ResultBean.success("查询点检结果").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).
|
||||
setResultList(mesYfBoardService.queryInspectionResults(conditionModel));
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询异常停线时间", notes = "查询异常停线时间")
|
||||
@PostMapping("/query-abnormal-downtime")
|
||||
public ResultBean queryAbnormalDowntime(MesWorkCenterBoardConditionModel conditionModel){
|
||||
try {
|
||||
ValidatorBean.beginValid(conditionModel)
|
||||
.notNull("workCenterCodeList", conditionModel.getWorkCenterCodeList())
|
||||
.notNull("timeRangeIdentification", conditionModel.getTimeRangeIdentification());
|
||||
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
conditionModel.setOrganizeCode(organizeCode);
|
||||
return ResultBean.success("查询异常停线时间").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).
|
||||
setResultObject(mesYfBoardService.queryAbnormalDowntime(conditionModel));
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesYfReportService;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProdRuleReportConditionModel;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.impp.framework.base.controller.MesBaseController;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import cn.estsh.impp.framework.boot.util.ValidatorBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @Description : 产线产品加工规则报表
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2024/6/17 15:37
|
||||
* @Modify:
|
||||
**/
|
||||
@Api("产线产品加工规则报表")
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/prod-rule-report")
|
||||
public class MesProdRuleReportController extends MesBaseController {
|
||||
|
||||
@Autowired
|
||||
private IMesYfReportService mesYfReportService;
|
||||
|
||||
@ApiOperation(value = "查询产线产品加工规则报表", notes = "查询产线产品加工规则报表")
|
||||
@GetMapping("/query")
|
||||
public ResultBean queryMesProdRuleByPager(MesProdRuleReportConditionModel conditionModel, Pager pager){
|
||||
try {
|
||||
ValidatorBean.beginValid(conditionModel).notNull("isSort", conditionModel.getIsSort());
|
||||
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
conditionModel.setOrganizeCode(organizeCode);
|
||||
return mesYfReportService.queryMesProdRuleByPager(conditionModel, pager);
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.board;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.board.IMesYfBoardService;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardConditionModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardResultModel;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 看板-业务方法实现
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2024/6/19 11:08
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
public class IMesYfBoardServiceImpl implements IMesYfBoardService {
|
||||
|
||||
/**
|
||||
* 产线看板
|
||||
*/
|
||||
@Override
|
||||
public List<MesWorkCenterBoardResultModel> queryWorkCenterStatus(MesWorkCenterBoardConditionModel conditionModel) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MesWorkCenterBoardResultModel queryWorkCenterProductionCompletionRate(MesWorkCenterBoardConditionModel conditionModel) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesWorkCenterBoardResultModel> queryWorkCenterWorkOrderCompletionStatus(MesWorkCenterBoardConditionModel conditionModel) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesWorkCenterBoardResultModel> queryUnitHourCompletionRate(MesWorkCenterBoardConditionModel conditionModel) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesWorkCenterBoardResultModel> queryWorkCenterFirstTimeOfflineQualificationRate(MesWorkCenterBoardConditionModel conditionModel) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesWorkCenterBoardResultModel> queryInspectionResults(MesWorkCenterBoardConditionModel conditionModel) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MesWorkCenterBoardResultModel queryAbnormalDowntime(MesWorkCenterBoardConditionModel conditionModel) {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package cn.estsh.i3plus.ext.mes.pojo.model.board;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 产线看板-查询条件封装
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2024/6/19 11:13
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("产线看板-查询条件封装")
|
||||
public class MesWorkCenterBoardConditionModel {
|
||||
|
||||
@ApiParam(value = "组织代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam(value = "产线代码集合")
|
||||
private List<String> workCenterCodeList;
|
||||
|
||||
@ApiParam(value = "时间范围标识")
|
||||
private Integer timeRangeIdentification;
|
||||
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package cn.estsh.i3plus.ext.mes.pojo.model.board;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 产线看板-查询结果封装
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2024/6/19 15:26
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("产线看板-查询结果封装")
|
||||
public class MesWorkCenterBoardResultModel {
|
||||
|
||||
/**
|
||||
* 查询产线状态
|
||||
*/
|
||||
@ApiParam(value = "产线代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam(value = "产线状态")
|
||||
private Integer workCenterCodeStatus;
|
||||
|
||||
/**
|
||||
* 查询产线生产完成率
|
||||
*/
|
||||
@ApiParam(value = "产线完成数")
|
||||
private Integer workCenterCompletedQuantity;
|
||||
|
||||
@ApiParam(value = "产线计划数")
|
||||
private Integer workCenterPlannedQuantity;
|
||||
|
||||
@ApiParam(value = "产线完成率")
|
||||
private Double workCenterCompletionRate;
|
||||
|
||||
/**
|
||||
* 查询产线工单完成情况
|
||||
*/
|
||||
@ApiParam(value = "工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam(value = "零件号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam(value = "零件描述")
|
||||
private String partDescription;
|
||||
|
||||
@ApiParam(value = "工单完成数")
|
||||
private Integer workOrderCompletedQuantity;
|
||||
|
||||
@ApiParam(value = "工单计划数")
|
||||
private Integer workOrderPlannedQuantity;
|
||||
|
||||
@ApiParam(value = "工单一次合格率")
|
||||
private Double workOrderFirstPassRate;
|
||||
|
||||
/**
|
||||
* 查询单位小时完工数
|
||||
*/
|
||||
@ApiParam(value = "单位小时完工数目标值")
|
||||
private Double unitHourCompletionRateTargetValue;
|
||||
|
||||
@ApiParam(value = "单位小时完工数")
|
||||
private Integer unitHourCompletionRate;
|
||||
|
||||
@ApiParam(value = "单位小时完工数-时间段")
|
||||
private String unitHourCompletionRateTimePeriod;
|
||||
|
||||
/**
|
||||
* 查询产线一次下线合格率
|
||||
*/
|
||||
@ApiParam(value = "产线一次下线合格率")
|
||||
private Double workCenterFirstTimeOfflineQualificationRate;
|
||||
|
||||
@ApiParam(value = "产线一次下线合格率-时间段")
|
||||
private String workCenterFirstTimeOfflineQualificationRateTimePeriod;
|
||||
|
||||
/**
|
||||
* 查询点检结果
|
||||
*/
|
||||
@ApiParam(value = "点检项")
|
||||
private String inspectionItems;
|
||||
|
||||
@ApiParam(value = "点检结果")
|
||||
private Integer inspectionResults;
|
||||
|
||||
/**
|
||||
* 查询异常停线时间
|
||||
*/
|
||||
@ApiParam(value = "异常停机时间")
|
||||
private Double abnormalDowntime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package cn.estsh.i3plus.ext.mes.pojo.model.report;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 产线产品加工规则报表-查询条件封装
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2024/6/17 15:52
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("产线产品加工规则报表-查询条件封装")
|
||||
public class MesProdRuleReportConditionModel {
|
||||
|
||||
@ApiParam(value = "组织代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam(value = "工作中心（产线）")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam(value = "工作单元代码（工位）")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam(value = "设备代码（设备编号）")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam(value = "进料零件号")
|
||||
private String inPartNo;
|
||||
|
||||
@ApiParam(value = "进料零件规则")
|
||||
private String inPartNoRule;
|
||||
|
||||
@ApiParam(value = "产成零件号")
|
||||
private String outPartNo;
|
||||
|
||||
@ApiParam(value = "是否排序")
|
||||
private Integer isSort;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue