forked from I3-YF/i3plus-mes-yfai
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.javatags/yfai-mes-ext-v1.0
jun
10 months ago
commit
abfb72759f
@ -0,0 +1,26 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.busi.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 工位扫描日志合并设备日志报表
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2023/02/06 13:42
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesWorkCellScanMonitorLogService {
|
||||
|
||||
/**
|
||||
* 查询工位扫描日志合并设备日志报表
|
||||
* @param conditionModel
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "查询工位扫描日志合并设备日志报表")
|
||||
List<MesWorkCellScanMonitorLogModel> queryWorkCellScanMonitorLogList(MesWorkCellScanMonitorConditionModel conditionModel);
|
||||
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesWorkCellScanMonitorLogService;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
|
||||
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.impp.framework.base.controller.BaseController;
|
||||
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 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.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :工位扫描日志合并设备日志报表
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2023/02/06 09:59
|
||||
* @Modify:
|
||||
**/
|
||||
@RestController
|
||||
@RequestMapping(CommonConstWords.BASE_URL_MES)
|
||||
@Api(tags = "工位扫描日志合并设备日志报表")
|
||||
public class MesWorkCellScanMonitorLogController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private IMesWorkCellScanMonitorLogService workCellScanMonitorLogService;
|
||||
|
||||
@PostMapping(value = "/ext/work-cell-scan-monitor-log/report/query")
|
||||
@ApiOperation(value = "查询工位扫描日志合并设备日志报表")
|
||||
public ResultBean queryWorkCellScanMonitorLogList(@RequestBody MesWorkCellScanMonitorConditionModel conditionModel) {
|
||||
try {
|
||||
conditionModel.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
|
||||
List<MesWorkCellScanMonitorLogModel> result = workCellScanMonitorLogService.queryWorkCellScanMonitorLogList(conditionModel);
|
||||
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesWorkCellScanMonitorLogService;
|
||||
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesWcEquipment;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.MesWcEquipmentRepository;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogService {
|
||||
|
||||
@Autowired
|
||||
private MesWcEquipmentRepository equipmentRepository;
|
||||
|
||||
@Override
|
||||
public List<MesWorkCellScanMonitorLogModel> queryWorkCellScanMonitorLogList(MesWorkCellScanMonitorConditionModel conditionModel) {
|
||||
|
||||
List<MesWcEquipment> wcEquipmentList = beforeCheckCondition(conditionModel);
|
||||
|
||||
List<MesWorkCellScanMonitorConditionModel> conditionModelList = getConditionModelList(conditionModel, wcEquipmentList);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private List<MesWcEquipment> beforeCheckCondition(MesWorkCellScanMonitorConditionModel conditionModel) {
|
||||
|
||||
if (StringUtils.isEmpty(conditionModel.getWorkCellCode()) && StringUtils.isEmpty(conditionModel.getEquipmentCode())) MesException.throwBusiException("请输入工位代码或者设备代码进行查询!");
|
||||
|
||||
if (!StringUtils.isEmpty(conditionModel.getWorkCellCode()) && StringUtils.isEmpty(conditionModel.getWorkCenterCode())) MesException.throwBusiException("查询参数异常,工位[%s]未携带生产线查询条件!");
|
||||
|
||||
List<MesWcEquipment> wcEquipmentList = getEquipmentList(conditionModel);
|
||||
if (!StringUtils.isEmpty(conditionModel.getWorkCellCode()) && !StringUtils.isEmpty(conditionModel.getEquipmentCode()) &&
|
||||
CollectionUtils.isEmpty(wcEquipmentList)) MesException.throwBusiException("生产线[%s]工位[%s]未关联设备[%s]", conditionModel.getWorkCenterCode(), conditionModel.getWorkCellCode(), conditionModel.getEquipmentCode());
|
||||
|
||||
if (!StringUtils.isEmpty(conditionModel.getWorkCellCode()) && StringUtils.isEmpty(conditionModel.getEquipmentCode()) &&
|
||||
CollectionUtils.isEmpty(wcEquipmentList)) MesException.throwBusiException("生产线[%s]工位[%s]未关联设备信息", conditionModel.getWorkCenterCode(), conditionModel.getWorkCellCode());
|
||||
|
||||
if (StringUtils.isEmpty(conditionModel.getWorkCellCode()) && !StringUtils.isEmpty(conditionModel.getEquipmentCode()) &&
|
||||
CollectionUtils.isEmpty(wcEquipmentList)) MesException.throwBusiException("设备[%s]未关联工位", conditionModel.getEquipmentCode());
|
||||
|
||||
return wcEquipmentList;
|
||||
}
|
||||
|
||||
private List<MesWcEquipment> getEquipmentList(MesWorkCellScanMonitorConditionModel conditionModel) {
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(conditionModel.getOrganizeCode());
|
||||
DdlPreparedPack.getStringEqualPack(conditionModel.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);
|
||||
DdlPreparedPack.getStringEqualPack(conditionModel.getWorkCellCode(), MesExtConstWords.WORK_CELL_CODE, packBean);
|
||||
DdlPreparedPack.getStringEqualPack(conditionModel.getEquipmentCode(), MesExtConstWords.EQUIPMENT_CODE, packBean);
|
||||
return equipmentRepository.findByHqlWhere(packBean);
|
||||
}
|
||||
|
||||
private List<MesWorkCellScanMonitorConditionModel> getConditionModelList(MesWorkCellScanMonitorConditionModel conditionModel, List<MesWcEquipment> wcEquipmentList) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package cn.estsh.i3plus.ext.mes.pojo.model.report;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@ApiModel("工位扫描日志合并设备日志报表-查询条件封装")
|
||||
public class MesWorkCellScanMonitorConditionModel {
|
||||
|
||||
@ApiParam(value = "表标识, 1=monitor 2=logdetail")
|
||||
private Integer flag;
|
||||
|
||||
@ApiParam(value = "组织代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam(value = "产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam(value = "工位")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam(value = "设备ID")
|
||||
private String equipId;
|
||||
|
||||
@ApiParam(value = "设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备变量ID")
|
||||
private String equipVariableId;
|
||||
|
||||
@ApiParam("设备变量名称")
|
||||
private String equipVariableName;
|
||||
|
||||
@ApiParam("开模记录ID")
|
||||
private String mouldRecordId;
|
||||
|
||||
@ApiParam("扫描/读取信息")
|
||||
private String scanInfo;
|
||||
|
||||
@ApiParam("生产工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam("零件条码")
|
||||
private String productSn;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@ApiParam("日志类型")
|
||||
private Integer logType;
|
||||
|
||||
@ApiParam("信息类型")
|
||||
private Integer messageType;
|
||||
|
||||
@ApiParam("查询条数")
|
||||
private Integer limit;
|
||||
|
||||
@ApiParam("查询时间起始")
|
||||
private String createDatetimeStart;
|
||||
|
||||
@ApiParam("查询时间截止")
|
||||
private String createDatetimeEnd;
|
||||
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
package cn.estsh.i3plus.ext.mes.pojo.model.report;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@ApiModel("工位扫描日志合并设备日志报表-查询条件封装")
|
||||
public class MesWorkCellScanMonitorLogModel {
|
||||
|
||||
@ApiParam("开模记录ID")
|
||||
private Long mouldRecordId;
|
||||
|
||||
@ApiParam("区域代码")
|
||||
private String areaCode;
|
||||
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
@ApiParam("工序名称")
|
||||
private String processName;
|
||||
|
||||
@ApiParam("工艺代码")
|
||||
private String craftCode;
|
||||
|
||||
@ApiParam("工艺名称")
|
||||
private String craftName;
|
||||
|
||||
@ApiParam("扫描/读取信息")
|
||||
private String scanInfo;
|
||||
|
||||
@ApiParam("生产工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam("零件条码")
|
||||
private String productSn;
|
||||
|
||||
@ApiParam("工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@ApiParam("日志类型")
|
||||
private Integer logType;
|
||||
|
||||
@ApiParam("日志内容")
|
||||
private String message;
|
||||
|
||||
@ApiParam("信息类型")
|
||||
private Integer messageType;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("设备变量ID")
|
||||
private Long equipVariableId;
|
||||
|
||||
@ApiParam("设备变量名称")
|
||||
private String equipVariableName;
|
||||
|
||||
@ApiParam("变量当前值")
|
||||
private String equipVariableValue;
|
||||
|
||||
@ApiParam("设备质量")
|
||||
private Integer quality;
|
||||
|
||||
@ApiParam("日志类型")
|
||||
private String logTypeName;
|
||||
|
||||
@ApiParam("信息类型")
|
||||
private String messageTypeName;
|
||||
|
||||
@ApiParam("设备质量")
|
||||
private String qualityName;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue