From b6aa88449d82b86721ca79158609ae241632e36e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 23 Dec 2024 20:29:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?44377=20=E6=A3=80=E9=AA=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=95=B0=E6=8D=AE=E6=80=BB=E6=8A=A5=E8=A1=A8=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E6=98=AF=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=9F=A5=E8=AF=A2=E5=BE=88=E6=85=A2=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E9=87=8D=E6=96=B0=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IMesInspectionProductDataReportService.java | 13 ++ .../MesInspectionProductDataReportController.java | 20 +- .../report/IMesInspectionProductDataReportDao.java | 17 ++ .../report/MesInspectionProductDataReportDao.java | 231 +++++++++++++++++++++ .../MesInspectionProductDataReportService.java | 49 +++++ .../MesInspectionProductDataAmountReportModel.java | 154 ++++++++++++++ .../i3plus/ext/mes/pojo/util/MesExtConstWords.java | 21 ++ 7 files changed, 495 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesInspectionProductDataReportService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesInspectionProductDataReportDao.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesInspectionProductDataReportService.java create mode 100644 modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesInspectionProductDataReportService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesInspectionProductDataReportService.java new file mode 100644 index 0000000..5c04762 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesInspectionProductDataReportService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.busi.report; + +import cn.estsh.i3plus.ext.mes.pojo.model.report.MesInspectionProductDataAmountReportModel; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiOperation; + +public interface IMesInspectionProductDataReportService { + + @ApiOperation(value = "检验产品数据总报表") + ListPager queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager); + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java index 1ea1897..e8fb13e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java @@ -1,8 +1,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.report; +import cn.estsh.i3plus.ext.mes.api.busi.report.IMesInspectionProductDataReportService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel; -import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.ext.mes.pojo.model.report.MesInspectionProductDataAmountReportModel; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.impp.framework.base.controller.BaseController; @@ -10,27 +10,27 @@ 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; -@Api("加工记录合并批量汇报查询报表") +@Api("检验产品数据总报表") @RestController @RequestMapping(MesCommonConstant.MES_YANFEN) public class MesInspectionProductDataReportController extends BaseController { + @Autowired + private IMesInspectionProductDataReportService inspectionProductDataReportService; + @GetMapping(value = "/inspection-product-data-amount/report/query") - @ApiOperation(value = "加工记录合并批量汇报查询报表") - public ResultBean queryInspectionProductDataAmountReport(MesProductionRecordReportExtModel model, Pager pager) { + @ApiOperation(value = "检验产品数据总报表") + public ResultBean queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager) { try { - ValidatorBean.beginValid(model) - .notNull(MesExtConstWords.COMPLETE_DATE_TIME_START, model.getCompleteDateTimeStart()) - .notNull(MesExtConstWords.COMPLETE_DATE_TIME_END, model.getCompleteDateTimeEnd()); model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - return ResultBean.success("查询成功").setListPager(null) + return ResultBean.success("查询成功").setListPager(inspectionProductDataReportService.queryInspectionProductDataAmountReport(model, pager)) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesInspectionProductDataReportDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesInspectionProductDataReportDao.java new file mode 100644 index 0000000..951457e --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesInspectionProductDataReportDao.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.ext.mes.apiservice.dao.report; + +import cn.estsh.i3plus.ext.mes.pojo.model.report.MesInspectionProductDataAmountReportModel; +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + +public interface IMesInspectionProductDataReportDao { + + @ApiOperation(value = "检验产品数据总报表-数量") + int queryInspectionProductDataAmountReportCount(MesInspectionProductDataAmountReportModel model); + + @ApiOperation(value = "检验产品数据总报表") + List queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager); + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java new file mode 100644 index 0000000..045ebd2 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java @@ -0,0 +1,231 @@ +package cn.estsh.i3plus.ext.mes.apiservice.daoimpl.report; + +import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesInspectionProductDataReportDao; +import cn.estsh.i3plus.ext.mes.pojo.model.report.MesInspectionProductDataAmountReportModel; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.mes.model.report.ShippingReportModel; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.persistence.EntityManager; +import javax.persistence.Query; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Service +public class MesInspectionProductDataReportDao implements IMesInspectionProductDataReportDao { + + @Autowired + private EntityManager entityManager; + + /** + * 检验产品数据总报表-数量 + * @param model + * @return + */ + @Override + public int queryInspectionProductDataAmountReportCount(MesInspectionProductDataAmountReportModel model) { + StringBuffer hql = new StringBuffer(); + hql.append(" select count(1) "); + + packHqlForQuery(hql, model); + + Query query = entityManager.createQuery(hql.toString(), Long.class); + + packParameterForQuery(query, model); + + return ((Long) query.getSingleResult()).intValue(); + } + + /** + * 检验产品数据总报表 + * @param model + * @param pager + * @return + */ + @Override + public List queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager) { + + StringBuffer hql = new StringBuffer(); + hql.append("select new ").append(MesInspectionProductDataAmountReportModel.class.getName()).append(" ( "); + // 添加所有需要查询的字段 + hql.append("mpi.id,"); + hql.append("mpid.id AS pid,"); + hql.append("mpi.inspectionDate,"); + hql.append("mpi.modifyDatetime,"); + hql.append("mpi.partName,"); + hql.append("mpi.partNo,"); + hql.append("mpi.sn,"); + hql.append("mpi.qty,"); + hql.append("mpi.workCenterCode,"); + hql.append("mpi.createUser,"); + hql.append("mpi.modifyUser AS ncModifyUser,"); + hql.append("mpi.inspectionStatus,"); + hql.append("mpi.ncStatus,"); + hql.append("mpid.defectLocation,"); + hql.append("mpid.frontBack,"); + hql.append("mpid.defectTypeName,"); + hql.append("mv.lgort,"); + hql.append("mv.umlgo,"); + hql.append("mv.zrsum,"); + hql.append("mrt.status AS taskStatus,"); + hql.append("mrt.modifyUser,"); + hql.append("mrt.reworkOrder,"); + hql.append("mrt.modifyUser,"); + hql.append("mp.partTypeCode,"); + hql.append("mwc.workCenterName"); + hql.append(")"); + + packHqlForQuery(hql, model); + + hql.append(" order by mpi.createDatetime asc "); + Query query = entityManager.createQuery(hql.toString(), MesInspectionProductDataAmountReportModel.class); + + packParameterForQuery(query, model); + + query.setMaxResults(pager.getPageSize()); + if (pager.getCurrentPage() == 0) { + pager.setCurrentPage(1); + } + query.setFirstResult(pager.getCurrentPage() * pager.getPageSize() - pager.getPageSize()); + return query.getResultList(); + + } + + private void packHqlForQuery(StringBuffer hql, MesInspectionProductDataAmountReportModel model) { + hql.append(" from MesPartInspection as mpi "); + hql.append(" left join MesPartInspectionDetail as mpid on (mpi.id = mpid.pid and mpid.organizeCode = :organizeCode and mpid.isDeleted = :isDeleted and mpid.isValid = :isValid) "); + hql.append(" left join MesMove as mm on (mpi.id = mm.partInspectionId and mm.organizeCode = :organizeCode and mm.isDeleted = :isDeleted and mm.isValid = :isValid) "); + hql.append(" left join MesReworkTask as mrt on (mpi.id = mrt.partInspectionId and mrt.organizeCode = :organizeCode and mrt.isDeleted = :isDeleted and mrt.isValid = :isValid) "); + hql.append(" left join MesPart as mp on (mpi.partNo = mp.partNo and mp.organizeCode = :organizeCode and mp.isDeleted = :isDeleted and mp.isValid = :isValid) "); + hql.append(" left join MesWorkCenter as mwc on (mpi.workCenterCode = mwc.workCenterCode and mwc.organizeCode = :organizeCode and mwc.isDeleted = :isDeleted and mwc.isValid = :isValid) "); + hql.append(" where mpi.organizeCode = :organizeCode "); + hql.append(" and mpi.isValid = :isValid "); + hql.append(" and mpi.isDeleted = :isDeleted "); + if (!StringUtils.isEmpty(model.getInspectionDateStart())) { + hql.append(" and mpi.inspectionDate >= :inspectionDateStart "); + } + if (!StringUtils.isEmpty(model.getInspectionDateEnd())) { + hql.append(" and mpi.inspectionDate <= :inspectionDateEnd "); + } + if (!StringUtils.isEmpty(model.getModifyDateTimeStart())) { + hql.append(" and mpi.modifyDatetime >= :modifyDateTimeStart "); + } + if (!StringUtils.isEmpty(model.getModifyDateTimeEnd())) { + hql.append(" and mpi.modifyDatetime <= :modifyDateTimeEnd "); + } + if (!StringUtils.isEmpty(model.getPartNo())) { + hql.append(" and mpi.partNo like :partNo "); + } + if (!StringUtils.isEmpty(model.getPartName())) { + hql.append(" and mpi.partName like :partName "); + } + if (!StringUtils.isEmpty(model.getProductSn())) { + hql.append(" and mpi.sn like :productSn "); + } + if (!StringUtils.isEmpty(model.getWorkCenterCode())) { + hql.append(" and mpi.workCenterCode = :workCenterCode "); + } + if (!StringUtils.isEmpty(model.getCreateUser())) { + hql.append(" and mpi.createUser like :createUser "); + } + if (!StringUtils.isEmpty(model.getInspectionStatus())) { + hql.append(" and mpi.inspectionStatus = :inspectionStatus "); + } + if (!StringUtils.isEmpty(model.getNcStatus())) { + hql.append(" and mpi.ncStatus = :ncStatus "); + } + if (!StringUtils.isEmpty(model.getDefectLocation())) { + hql.append(" and mpid.defectLocation like :defectLocation "); + } + if (!StringUtils.isEmpty(model.getFrontBack())) { + hql.append(" and mpid.frontBack = :frontBack "); + } + if (!StringUtils.isEmpty(model.getDefectTypeName())) { + hql.append(" and mpid.defectTypeName like :defectTypeName "); + } + if (!StringUtils.isEmpty(model.getUmlgo())) { + hql.append(" and mm.umlgo = :umlgo "); + } + if (!StringUtils.isEmpty(model.getTaskStatus())) { + hql.append(" and mrt.status = :taskStatus "); + } + if (!StringUtils.isEmpty(model.getModifyUser())) { + hql.append(" and mrt.modifyUser like :modifyUser "); + } + if (!StringUtils.isEmpty(model.getReworkOrder())) { + hql.append(" and mrt.reworkOrder like :reworkOrder "); + } + if (!StringUtils.isEmpty(model.getPartTypeCode())) { + hql.append(" and mp.partTypeCode like :partTypeCode "); + } + } + + private void packParameterForQuery(Query query, MesInspectionProductDataAmountReportModel model) { + query.setParameter(MesExtConstWords.ORGANIZE_CODE, model.getOrganizeCode()); + query.setParameter(MesExtConstWords.IS_VALID, CommonEnumUtil.IS_VAILD.VAILD.getValue()); + query.setParameter(MesExtConstWords.IS_DELETED, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + if (!StringUtils.isEmpty(model.getInspectionDateStart())) { + query.setParameter(MesExtConstWords.INSPECTION_DATE_START, model.getInspectionDateStart()); + } + if (!StringUtils.isEmpty(model.getInspectionDateEnd())) { + query.setParameter(MesExtConstWords.INSPECTION_DATE_END, model.getInspectionDateEnd()); + } + if (!StringUtils.isEmpty(model.getModifyDateTimeStart())) { + query.setParameter(MesExtConstWords.MODIFY_DATE_TIME_START, model.getModifyDateTimeStart()); + } + if (!StringUtils.isEmpty(model.getModifyDateTimeEnd())) { + query.setParameter(MesExtConstWords.MODIFY_DATE_TIME_END, model.getModifyDateTimeEnd()); + } + if (!StringUtils.isEmpty(model.getPartNo())) { + query.setParameter(MesExtConstWords.PART_NO, MesExtConstWords.PERCENT + model.getPartNo() + MesExtConstWords.PERCENT); + } + if (!StringUtils.isEmpty(model.getPartName())) { + query.setParameter(MesExtConstWords.PART_NAME, MesExtConstWords.PERCENT + model.getPartName() + MesExtConstWords.PERCENT); + } + if (!StringUtils.isEmpty(model.getProductSn())) { + query.setParameter(MesExtConstWords.PRODUCT_SN, MesExtConstWords.PERCENT + model.getProductSn() + MesExtConstWords.PERCENT); + } + if (!StringUtils.isEmpty(model.getWorkCenterCode())) { + query.setParameter(MesExtConstWords.WORK_CENTER_CODE, model.getWorkCenterCode()); + } + if (!StringUtils.isEmpty(model.getCreateUser())) { + query.setParameter(MesExtConstWords.CREATE_USER, MesExtConstWords.PERCENT + model.getCreateUser() + MesExtConstWords.PERCENT); + } + if (!StringUtils.isEmpty(model.getInspectionStatus())) { + query.setParameter(MesExtConstWords.INSPECTION_STATUS, model.getInspectionStatus()); + } + if (!StringUtils.isEmpty(model.getNcStatus())) { + query.setParameter(MesExtConstWords.NC_STATUS, model.getNcStatus()); + } + if (!StringUtils.isEmpty(model.getDefectLocation())) { + query.setParameter(MesExtConstWords.DEFECT_LOCATION, MesExtConstWords.PERCENT + model.getDefectLocation() + MesExtConstWords.PERCENT); + } + if (!StringUtils.isEmpty(model.getFrontBack())) { + query.setParameter(MesExtConstWords.FRONT_BACK, model.getFrontBack()); + } + if (!StringUtils.isEmpty(model.getDefectTypeName())) { + query.setParameter(MesExtConstWords.DEFECT_TYPE_NAME, MesExtConstWords.PERCENT + model.getDefectTypeName() + MesExtConstWords.PERCENT); + } + if (!StringUtils.isEmpty(model.getUmlgo())) { + query.setParameter(MesExtConstWords.UMLGO, model.getUmlgo()); + } + if (!StringUtils.isEmpty(model.getTaskStatus())) { + query.setParameter(MesExtConstWords.TASK_STATUS, model.getTaskStatus()); + } + if (!StringUtils.isEmpty(model.getModifyUser())) { + query.setParameter(MesExtConstWords.MODIFY_USER, MesExtConstWords.PERCENT + model.getModifyUser() + MesExtConstWords.PERCENT); + } + if (!StringUtils.isEmpty(model.getReworkOrder())) { + query.setParameter(MesExtConstWords.REWORK_ORDER, MesExtConstWords.PERCENT + model.getReworkOrder() + MesExtConstWords.PERCENT); + } + if (!StringUtils.isEmpty(model.getPartTypeCode())) { + query.setParameter(MesExtConstWords.PART_TYPE_CODE, MesExtConstWords.PERCENT + model.getPartTypeCode() + MesExtConstWords.PERCENT); + } + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesInspectionProductDataReportService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesInspectionProductDataReportService.java new file mode 100644 index 0000000..35637bd --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesInspectionProductDataReportService.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report; + +import cn.estsh.i3plus.ext.mes.api.busi.report.IMesInspectionProductDataReportService; +import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesInspectionProductDataReportDao; +import cn.estsh.i3plus.ext.mes.pojo.model.report.MesInspectionProductDataAmountReportModel; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +import lombok.extern.slf4j.Slf4j; +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 +@Slf4j +public class MesInspectionProductDataReportService implements IMesInspectionProductDataReportService { + + @Autowired + private IMesInspectionProductDataReportDao inspectionProductDataReportDao; + + /** + * 检验产品数据总报表 + * @param model 查询条件 + * @param pager 分页条件 + * @return + */ + @Override + public ListPager queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager) { + pager = PagerHelper.getPager(pager, inspectionProductDataReportDao.queryInspectionProductDataAmountReportCount(model)); + List resultList = inspectionProductDataReportDao.queryInspectionProductDataAmountReport(model, pager); + + if (!CollectionUtils.isEmpty(resultList)) { + for (MesInspectionProductDataAmountReportModel result : resultList) { + if (null == result) continue; + if (!StringUtils.isEmpty(result.getFrontBack())) result.setFrontBackName(MesExtEnumUtil.DEFECT_ALARM_CONFIG_SIDES.valueOfDescription(result.getFrontBack())); + if (!StringUtils.isEmpty(result.getInspectionStatus())) result.setInspectionStatusName(MesExtEnumUtil.PART_INSPECTION_STATUS.valueOfDescription(result.getInspectionStatus())); + if (!StringUtils.isEmpty(result.getNcStatus())) result.setNcStatusName(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.valueOfDescription(result.getNcStatus())); + if (!StringUtils.isEmpty(result.getTaskStatus())) result.setTaskStatusName(MesExtEnumUtil.REWORK_TASK_STATUS.valueOfDescription(result.getTaskStatus())); + } + } + + return new ListPager<>(resultList, pager); + } + +} diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java new file mode 100644 index 0000000..0e6142f --- /dev/null +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java @@ -0,0 +1,154 @@ +package cn.estsh.i3plus.ext.mes.pojo.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.springframework.util.StringUtils; + +import java.io.Serializable; + +@Data +@ApiModel("检验产品数据总报表") +public class MesInspectionProductDataAmountReportModel implements Serializable { + + private static final long serialVersionUID = -2963567250001047604L; + + //-----------查询条件------------- + + @ApiParam(value = "组织代码") + private String organizeCode; + + @ApiParam(value = "检验日期起始") + private String inspectionDateStart; + + @ApiParam(value = "检验日期截止") + private String inspectionDateEnd; + + @ApiParam(value = "NC判定时间起始") + private String modifyDateTimeStart; + + @ApiParam(value = "NC判定时间截止") + private String modifyDateTimeEnd; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "零件条码") + private String productSn; + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("检验人") + private String createUser; + + @ApiParam("检验结果") + private Integer inspectionStatus; + + @ApiParam("NC判定结果") + private Integer ncStatus; + + @ApiParam("NC处理结果") + private Integer taskStatus; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("正面反面(方向)") + private Integer frontBack; + + @ApiParam("缺陷描述") + private String defectTypeName; + + @ApiParam("责任库区") + private String umlgo; + + @ApiParam("返工人") + private String modifyUser; + + @ApiParam("返工单号") + private String reworkOrder; + + @ApiParam("零件类型") + private String partTypeCode; + +//-----------展示列------------- + + @ApiParam(value = "id") + private Long id; + + @ApiParam(value = "pid") + private Long pid; + + @ApiParam(value = "检验日期") + private String inspectionDate; + + @ApiParam(value = "条码") + private String sn; + + @ApiParam("数量") + private Integer qty; + + @ApiParam("生产线名称") + private String workCenterName; + + @ApiParam("检验结果(名称)") + private String inspectionStatusName; + + @ApiParam("方向") + private String frontBackName; + + @ApiParam("NC判定结果(名称)") + private String ncStatusName; + + @ApiParam("源库区") + private String lgort; + + @ApiParam("NC处理结果(名称)") + private String taskStatusName; + + @ApiParam(value = "NC判定时间") + private String modifyDatetime; + + @ApiParam("NC判定人") + private String ncModifyUser; + + @ApiParam("zrsum") + private String zrsum; + + public MesInspectionProductDataAmountReportModel() {} + + public MesInspectionProductDataAmountReportModel(Long id, Long pid, String inspectionDate, String modifyDatetime, String partName, String partNo, String sn, Integer qty, String workCenterCode, + String createUser, String ncModifyUser, Integer inspectionStatus, Integer ncStatus, String defectLocation, Integer frontBack, String defectTypeName, + String lgort, String umlgo, String zrsum, Integer taskStatus, String reworkOrder, String modifyUser, String partTypeCode, String workCenterName) { + this.id = id; + this.pid = pid; + this.inspectionDate = inspectionDate; + this.modifyDatetime = modifyDatetime; + this.partName = partName; + this.partNo = partNo; + this.sn = sn; + this.qty = qty; + this.workCenterCode = workCenterCode; + this.createUser = createUser; + this.ncModifyUser = ncModifyUser; + this.inspectionStatus = inspectionStatus; + this.ncStatus = ncStatus; + this.defectLocation = defectLocation; + this.frontBack = frontBack; + this.defectTypeName = defectTypeName; + this.lgort = lgort; + this.umlgo = umlgo; + this.zrsum = zrsum; + this.taskStatus = taskStatus; + this.modifyUser = modifyUser; + this.reworkOrder = reworkOrder; + this.modifyUser = modifyUser; + this.partTypeCode = partTypeCode; + this.workCenterName = workCenterName; + } + +} diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index d8f3f89..a535d95 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -205,6 +205,25 @@ public class MesExtConstWords { public static final String PULL_ADDR = "pullAddr"; //点检单id public static final String SPOT_CHECK_ORDER_ID = "spotCheckOrderId"; + //检验结果 + public static final String INSPECTION_STATUS = "inspectionStatus"; + //NC判定结果 + public static final String NC_STATUS = "ncStatus"; + //缺陷位置 + public static final String DEFECT_LOCATION = "defectLocation"; + //正面反面" + public static final String FRONT_BACK = "frontBack"; + //缺陷名称 + public static final String DEFECT_TYPE_NAME = "defectTypeName"; + //目标库存地点 + public static final String UMLGO = "umlgo"; + //任务状态 + public static final String TASK_STATUS = "taskStatus"; + //返工单据号 + public static final String REWORK_ORDER = "reworkOrder"; + //零件类别 + public static final String PART_TYPE_CODE = "partTypeCode"; + //时间[开始/结束]条件 public static final String START_TIME_START = "startTimeStart"; @@ -217,6 +236,8 @@ public class MesExtConstWords { public static final String MODIFY_DATE_TIME_END = "modifyDatetimeEnd"; public static final String COMPLETE_DATE_TIME_START = "completeDateTimeStart"; public static final String COMPLETE_DATE_TIME_END = "completeDateTimeEnd"; + public static final String INSPECTION_DATE_START = "inspectionDateStart"; + public static final String INSPECTION_DATE_END = "inspectionDateEnd"; //0 public static final int ZERO = 0; From 955a5c8d8bf2a3b4bab021eb503d34a08a7a5baa Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 24 Dec 2024 12:49:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?44377=20=E6=A3=80=E9=AA=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=95=B0=E6=8D=AE=E6=80=BB=E6=8A=A5=E8=A1=A8=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E6=98=AF=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=9F=A5=E8=AF=A2=E5=BE=88=E6=85=A2=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E9=87=8D=E6=96=B0=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/MesInspectionProductDataReportController.java | 3 ++- .../daoimpl/report/MesInspectionProductDataReportDao.java | 8 +++----- .../model/report/MesInspectionProductDataAmountReportModel.java | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java index e8fb13e..93bb276 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java @@ -29,7 +29,8 @@ public class MesInspectionProductDataReportController extends BaseController { @ApiOperation(value = "检验产品数据总报表") public ResultBean queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager) { try { - model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + model.setOrganizeCode("CR01"); +// model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); return ResultBean.success("查询成功").setListPager(inspectionProductDataReportService.queryInspectionProductDataAmountReport(model, pager)) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java index 045ebd2..3a422b8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java @@ -70,17 +70,15 @@ public class MesInspectionProductDataReportDao implements IMesInspectionProductD hql.append("mpid.defectLocation,"); hql.append("mpid.frontBack,"); hql.append("mpid.defectTypeName,"); - hql.append("mv.lgort,"); - hql.append("mv.umlgo,"); - hql.append("mv.zrsum,"); + hql.append("mm.lgort,"); + hql.append("mm.umlgo,"); + hql.append("mm.zrsum,"); hql.append("mrt.status AS taskStatus,"); - hql.append("mrt.modifyUser,"); hql.append("mrt.reworkOrder,"); hql.append("mrt.modifyUser,"); hql.append("mp.partTypeCode,"); hql.append("mwc.workCenterName"); hql.append(")"); - packHqlForQuery(hql, model); hql.append(" order by mpi.createDatetime asc "); diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java index 0e6142f..819a3fc 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java @@ -144,7 +144,6 @@ public class MesInspectionProductDataAmountReportModel implements Serializable { this.umlgo = umlgo; this.zrsum = zrsum; this.taskStatus = taskStatus; - this.modifyUser = modifyUser; this.reworkOrder = reworkOrder; this.modifyUser = modifyUser; this.partTypeCode = partTypeCode; From b2fec000c5114aef4bd8529c89fe87bacee1ab13 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 24 Dec 2024 12:58:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?44377=20=E6=A3=80=E9=AA=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=95=B0=E6=8D=AE=E6=80=BB=E6=8A=A5=E8=A1=A8=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E6=98=AF=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=9F=A5=E8=AF=A2=E5=BE=88=E6=85=A2=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E9=87=8D=E6=96=B0=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/report/MesInspectionProductDataReportController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java index 93bb276..e8fb13e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java @@ -29,8 +29,7 @@ public class MesInspectionProductDataReportController extends BaseController { @ApiOperation(value = "检验产品数据总报表") public ResultBean queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager) { try { - model.setOrganizeCode("CR01"); -// model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); return ResultBean.success("查询成功").setListPager(inspectionProductDataReportService.queryInspectionProductDataAmountReport(model, pager)) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) {