forked from I3-YF/i3plus-mes-yfai
Compare commits
No commits in common. 'uat-temp-wj-250124-equ-check-step' and 'master' have entirely different histories.
uat-temp-w
...
master
@ -1,6 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesCimGmCbrRule;
|
||||
|
||||
public interface IMesCimGmCbrRuleService extends IBaseMesService<MesCimGmCbrRule>{
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPackingRuleDetail;
|
||||
|
||||
public interface IMesPackingRuleDetailService extends IBaseMesService<MesPackingRuleDetail> {
|
||||
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPackingRule;
|
||||
|
||||
public interface IMesPackingRuleService extends IBaseMesService<MesPackingRule> {
|
||||
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
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<MesInspectionProductDataAmountReportModel> queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager);
|
||||
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.api.busi.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
public interface IMesProductionRecordReportExtService {
|
||||
|
||||
@ApiOperation(value = "加工记录合并批量汇报查询报表")
|
||||
ListPager<MesProductionRecordReportExtModel> queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel model, Pager pager);
|
||||
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesCimGmCbrRule;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* 通过CBR功能
|
||||
*/
|
||||
@Api(value ="通用CBR功能" )
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mes_cim_gm_cbr_rule")
|
||||
public class MesCimGmCbrRuleController extends BaseMesController<MesCimGmCbrRule>{
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPackingRule;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@Api("成品包装规则")
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPackingRule")
|
||||
public class MesPackingRuleController extends BaseMesController<MesPackingRule>{
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPackingRuleDetail;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@Api("成品包装明细规则")
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPackingRuleDetail")
|
||||
public class MesPackingRuleDetailController extends BaseMesController<MesPackingRuleDetail>{
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
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.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;
|
||||
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.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@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(MesInspectionProductDataAmountReportModel model, Pager pager) {
|
||||
try {
|
||||
model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
|
||||
return ResultBean.success("查询成功").setListPager(inspectionProductDataReportService.queryInspectionProductDataAmountReport(model, pager))
|
||||
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||
} catch (ImppBusiException busExcep) {
|
||||
return ResultBean.fail(busExcep);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesProductionRecordReportExtService;
|
||||
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.pojo.base.common.Pager;
|
||||
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 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("加工记录合并批量汇报查询报表")
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN)
|
||||
public class MesProductionRecordReportExtController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private IMesProductionRecordReportExtService productionRecordReportExtService;
|
||||
|
||||
@GetMapping(value = "/production-record/union/work-order-log/report/query")
|
||||
@ApiOperation(value = "加工记录合并批量汇报查询报表")
|
||||
public ResultBean queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel 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(productionRecordReportExtService.queryProductionRecordUnionWorkOrderLogReport(model, pager))
|
||||
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||
} catch (ImppBusiException busExcep) {
|
||||
return ResultBean.fail(busExcep);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
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<MesInspectionProductDataAmountReportModel> queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager);
|
||||
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.dao.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 加工记录合并批量汇报查询报表
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2024/9/29 10:21
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesProductionRecordReportExtDao {
|
||||
|
||||
ListPager<MesProductionRecordReportExtModel> queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel model, Pager pager, List<Integer> reportStatusList2Pr, List<Integer> reportStatusList2Wo);
|
||||
|
||||
}
|
||||
@ -1,229 +0,0 @@
|
||||
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<MesInspectionProductDataAmountReportModel> 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("mm.lgort,");
|
||||
hql.append("mm.umlgo,");
|
||||
hql.append("mm.zrsum,");
|
||||
hql.append("mrt.status AS taskStatus,");
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,283 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.daoimpl.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesProductionRecordReportExtDao;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
|
||||
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.base.enumutil.CommonEnumUtil;
|
||||
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 javax.persistence.EntityManager;
|
||||
import javax.persistence.Query;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 加工记录合并批量汇报查询报表
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2024/9/29 10:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class MesProductionRecordReportExtDao implements IMesProductionRecordReportExtDao {
|
||||
|
||||
@Autowired
|
||||
private EntityManager entityManager;
|
||||
|
||||
@Override
|
||||
public ListPager<MesProductionRecordReportExtModel> queryProductionRecordUnionWorkOrderLogReport(
|
||||
MesProductionRecordReportExtModel model, Pager pager, List<Integer> reportStatusList2Pr, List<Integer> reportStatusList2Wo) {
|
||||
|
||||
List<MesProductionRecordReportExtModel> resultList = new ArrayList<>();
|
||||
|
||||
StringBuilder queryHql = new StringBuilder();
|
||||
StringBuilder countHql = new StringBuilder();
|
||||
|
||||
StringBuilder unionQueryHql = new StringBuilder();
|
||||
StringBuilder countQueryHql = new StringBuilder();
|
||||
StringBuilder prQueryHql = new StringBuilder();
|
||||
StringBuilder woQueryHql = new StringBuilder();
|
||||
StringBuilder endHql = new StringBuilder();
|
||||
StringBuilder limitHql = new StringBuilder();
|
||||
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Pr) && !CollectionUtils.isEmpty(reportStatusList2Wo)) {
|
||||
unionQueryHql.append("SELECT " +
|
||||
" o.workCenterCode, " +
|
||||
" o.workCellCode, " +
|
||||
" o.partNo, " +
|
||||
" o.partName, " +
|
||||
" o.shiftCode, " +
|
||||
" o.equipmentCode, " +
|
||||
" o.equipmentName, " +
|
||||
" o.reportStatus, " +
|
||||
" o.dataSource, " +
|
||||
" o.statisticsQty " +
|
||||
" FROM " +
|
||||
" (( ");
|
||||
|
||||
countQueryHql.append("SELECT count(1) " +
|
||||
" FROM " +
|
||||
" (( ");
|
||||
} else {
|
||||
countQueryHql.append("SELECT count(1) FROM ( ");
|
||||
}
|
||||
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Pr)) {
|
||||
prQueryHql.append("" +
|
||||
" SELECT " +
|
||||
" a.work_center_code AS workCenterCode, " +
|
||||
" a.work_cell_code AS workCellCode, " +
|
||||
" a.part_no AS partNo, " +
|
||||
" a.part_name AS partName, " +
|
||||
" a.shift_code AS shiftCode, " +
|
||||
" a.equipment_code AS equipmentCode, " +
|
||||
" a.equipment_name AS equipmentName, " +
|
||||
" a.report_status AS reportStatus, " +
|
||||
" 1 AS dataSource, " +
|
||||
" SUM( qty ) AS statisticsQty " +
|
||||
" FROM ");
|
||||
|
||||
prQueryHql.append(" mes_production_record a " +
|
||||
" WHERE " +
|
||||
" a.organize_code = :organizeCode " +
|
||||
" AND a.is_deleted = :isDeleted " +
|
||||
" AND a.is_valid = :isValid " +
|
||||
" AND a.complete_date_time >= :completeDateTimeStart " +
|
||||
" AND a.complete_date_time <= :completeDateTimeEnd ");
|
||||
if (reportStatusList2Pr.size() == 1) {
|
||||
prQueryHql.append(" AND a.report_status = :reportStatus ");
|
||||
} else {
|
||||
prQueryHql.append(" AND a.report_status in (:reportStatus) ");
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getPartNo())) {
|
||||
prQueryHql.append(" AND a.part_no = :partNo ");
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getWorkCenterCode())) {
|
||||
prQueryHql.append(" AND a.work_center_code = :workCenterCode ");
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getWorkCellCode())) {
|
||||
prQueryHql.append(" AND a.work_cell_code = :workCellCode ");
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getShiftCode())) {
|
||||
prQueryHql.append(" AND a.shift_code = :shiftCode ");
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getEquipmentCode())) {
|
||||
prQueryHql.append(" AND a.equipment_code = :equipmentCode ");
|
||||
}
|
||||
prQueryHql.append(" GROUP BY " +
|
||||
" a.work_center_code, " +
|
||||
" a.work_cell_code, " +
|
||||
" a.part_no, " +
|
||||
" a.shift_code, " +
|
||||
" a.report_status " +
|
||||
" ORDER BY " +
|
||||
" a.complete_date_time DESC ");
|
||||
|
||||
}
|
||||
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Pr) && !CollectionUtils.isEmpty(reportStatusList2Wo)) {
|
||||
prQueryHql.append(" ) UNION ALL ( ");
|
||||
}
|
||||
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Wo)) {
|
||||
woQueryHql.append("" +
|
||||
" SELECT " +
|
||||
" b.work_center_code AS workCenterCode, " +
|
||||
" ' ' AS workCellCode, " +
|
||||
" b.part_no AS partNo, " +
|
||||
" b.part_name AS partName, " +
|
||||
" b.shift_code AS shiftCode, " +
|
||||
" ' ' AS equipmentCode, " +
|
||||
" ' ' AS equipmentName, " +
|
||||
" b.type AS reportStatus, " +
|
||||
" 2 AS dataSource, " +
|
||||
" SUM( modify_qty ) AS statisticsQty " +
|
||||
" FROM ");
|
||||
|
||||
woQueryHql.append(" mes_work_order_log b " +
|
||||
" WHERE " +
|
||||
" b.organize_code = :organizeCode " +
|
||||
" AND b.is_deleted = :isDeleted " +
|
||||
" AND b.is_valid = :isValid " +
|
||||
" AND b.modify_date_time >= :completeDateTimeStart " +
|
||||
" AND b.modify_date_time <= :completeDateTimeEnd ");
|
||||
if (reportStatusList2Wo.size() == 1) {
|
||||
woQueryHql.append(" AND b.type = :messageType ");
|
||||
} else {
|
||||
woQueryHql.append(" AND b.type in (:messageType) ");
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getPartNo())) {
|
||||
woQueryHql.append(" AND b.part_no = :partNo ");
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getWorkCenterCode())) {
|
||||
woQueryHql.append(" AND b.work_center_code = :workCenterCode ");
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getShiftCode())) {
|
||||
woQueryHql.append(" AND b.shift_code = :shiftCode ");
|
||||
}
|
||||
woQueryHql.append(" GROUP BY " +
|
||||
" b.work_center_code, " +
|
||||
" b.part_no, " +
|
||||
" b.shift_code " +
|
||||
" ORDER BY " +
|
||||
" b.modify_date_time DESC ");
|
||||
|
||||
}
|
||||
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Pr) && !CollectionUtils.isEmpty(reportStatusList2Wo)) {
|
||||
endHql.append(" )) AS o ");
|
||||
} else {
|
||||
endHql.append(" ) AS o ");
|
||||
}
|
||||
|
||||
limitHql.append(" LIMIT :startRow , :pageSize ");
|
||||
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Pr) && !CollectionUtils.isEmpty(reportStatusList2Wo)) {
|
||||
queryHql.append(unionQueryHql).append(prQueryHql).append(woQueryHql).append(endHql).append(limitHql);
|
||||
countHql.append(countQueryHql).append(prQueryHql).append(woQueryHql).append(endHql);
|
||||
} else {
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Pr)) {
|
||||
queryHql.append(prQueryHql).append(limitHql);
|
||||
countHql.append(countQueryHql).append(prQueryHql).append(endHql);
|
||||
} else {
|
||||
queryHql.append(woQueryHql).append(limitHql);
|
||||
countHql.append(countQueryHql).append(woQueryHql).append(endHql);
|
||||
}
|
||||
}
|
||||
|
||||
// log.info("queryHql: --- {}", queryHql.toString());
|
||||
// log.info("countHql: --- {}", countHql.toString());
|
||||
|
||||
Query dataQuery = entityManager.createNativeQuery(queryHql.toString());
|
||||
setQueryParams(dataQuery, model, reportStatusList2Pr, reportStatusList2Wo, pager);
|
||||
Query countQuery = entityManager.createNativeQuery(countHql.toString());
|
||||
setQueryParams(countQuery, model, reportStatusList2Pr, reportStatusList2Wo, null);
|
||||
|
||||
Object o = countQuery.getSingleResult();
|
||||
|
||||
int count = Integer.parseInt(o.toString());
|
||||
|
||||
List list = dataQuery.getResultList();
|
||||
|
||||
if (!CollectionUtils.isEmpty(list)) {
|
||||
|
||||
for (Object object : list) {
|
||||
|
||||
if (null == object) continue;
|
||||
|
||||
Object[] objectArr = (Object[]) object;
|
||||
|
||||
if (null == objectArr || objectArr.length != 10) continue;
|
||||
|
||||
MesProductionRecordReportExtModel result = new MesProductionRecordReportExtModel(
|
||||
objectArr[0], objectArr[1], objectArr[2], objectArr[3], objectArr[4], objectArr[5], objectArr[6], objectArr[7], objectArr[8], objectArr[9]);
|
||||
if (!StringUtils.isEmpty(result.getDataSource()) && !StringUtils.isEmpty(result.getReportStatus())) {
|
||||
if (result.getDataSource().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0) {
|
||||
if (result.getReportStatus().compareTo(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_20.getValue()) == 0) result.setReportStatusName(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_20.getDescription());
|
||||
else result.setReportStatusName(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getDescription());
|
||||
} else {
|
||||
result.setReportStatusName(MesExtEnumUtil.WORK_ORDER_LOG_TYPE.valueOfDescription(result.getReportStatus()));
|
||||
}
|
||||
}
|
||||
|
||||
resultList.add(result);
|
||||
}
|
||||
}
|
||||
|
||||
pager = PagerHelper.getPager(pager, count);
|
||||
return new ListPager(resultList, pager);
|
||||
|
||||
}
|
||||
|
||||
private void setQueryParams(Query query, MesProductionRecordReportExtModel model, List<Integer> reportStatusList2Pr, List<Integer> reportStatusList2Wo, Pager pager) {
|
||||
query.setParameter(MesExtConstWords.ORGANIZE_CODE, model.getOrganizeCode());
|
||||
query.setParameter(MesExtConstWords.IS_DELETED, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
|
||||
query.setParameter(MesExtConstWords.IS_VALID, CommonEnumUtil.IS_VAILD.VAILD.getValue());
|
||||
query.setParameter(MesExtConstWords.COMPLETE_DATE_TIME_START, model.getCompleteDateTimeStart());
|
||||
query.setParameter(MesExtConstWords.COMPLETE_DATE_TIME_END, model.getCompleteDateTimeEnd());
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Pr)) {
|
||||
if (reportStatusList2Pr.size() == 1) {
|
||||
query.setParameter(MesExtConstWords.REPORT_STATUS, reportStatusList2Pr.get(0));
|
||||
} else {
|
||||
query.setParameter(MesExtConstWords.REPORT_STATUS, reportStatusList2Pr);
|
||||
}
|
||||
}
|
||||
if (!CollectionUtils.isEmpty(reportStatusList2Wo)) {
|
||||
if (reportStatusList2Wo.size() == 1) {
|
||||
query.setParameter(MesExtConstWords.MESSAGE_TYPE, reportStatusList2Wo.get(0));
|
||||
} else {
|
||||
query.setParameter(MesExtConstWords.MESSAGE_TYPE, reportStatusList2Wo);
|
||||
}
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getPartNo())) {
|
||||
query.setParameter(MesExtConstWords.PART_NO, model.getPartNo());
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getWorkCenterCode())) {
|
||||
query.setParameter(MesExtConstWords.WORK_CENTER_CODE, model.getWorkCenterCode());
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getWorkCellCode())) {
|
||||
query.setParameter(MesExtConstWords.WORK_CELL_CODE, model.getWorkCellCode());
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getShiftCode())) {
|
||||
query.setParameter(MesExtConstWords.SHIFT_CODE, model.getShiftCode());
|
||||
}
|
||||
if (!StringUtils.isEmpty(model.getEquipmentCode())) {
|
||||
query.setParameter(MesExtConstWords.EQUIPMENT_CODE, model.getEquipmentCode());
|
||||
}
|
||||
if (null != pager) {
|
||||
Integer startRow = (pager.getCurrentPage() - 1) * pager.getPageSize();
|
||||
query.setParameter("startRow", startRow);
|
||||
query.setParameter("pageSize", pager.getPageSize());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.base.IMesCimGmCbrRuleService;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesCimGmCbrRule;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class MesCimGmCbrRuleServiceImpl extends BaseMesService<MesCimGmCbrRule> implements IMesCimGmCbrRuleService {
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.base.IMesPackingRuleDetailService;
|
||||
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.MesPackingRuleDetail;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class MesPackingRuleDetailService extends BaseMesService<MesPackingRuleDetail> implements IMesPackingRuleDetailService {
|
||||
|
||||
@Override
|
||||
protected void setPackQueryBean(MesPackingRuleDetail bean, DdlPackBean packBean) {
|
||||
DdlPreparedPack.getStringLikerPack(bean.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean);
|
||||
DdlPreparedPack.getStringLikerPack(bean.getPartNo(), MesExtConstWords.PART_NO, packBean);
|
||||
DdlPreparedPack.getStringEqualPack(bean.getPartType(), MesExtConstWords.PART_TYPE, packBean);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.base.IMesPackingRuleService;
|
||||
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.MesPackingRule;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class MesPackingRuleService extends BaseMesService<MesPackingRule> implements IMesPackingRuleService {
|
||||
|
||||
@Override
|
||||
protected void setPackQueryBean(MesPackingRule bean, DdlPackBean packBean) {
|
||||
DdlPreparedPack.getStringLikerPack(bean.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean);
|
||||
DdlPreparedPack.getNumEqualPack(bean.getDefaultFlag(), MesExtConstWords.DEFAULT_FLAG, packBean);
|
||||
DdlPreparedPack.getNumEqualPack(bean.getGenerateType(), MesExtConstWords.GENERATE_TYPE, packBean);
|
||||
DdlPreparedPack.getStringLikerPack(bean.getPackCode(), MesExtConstWords.PACK_CODE, packBean);
|
||||
DdlPreparedPack.getStringLikerPack(bean.getPackageBarcodeRule(), MesExtConstWords.PACKAGE_BARCODE_RULE, packBean);
|
||||
DdlPreparedPack.getStringLikerPack(bean.getPackageTemplate(), MesExtConstWords.PACKAGE_TEMPLATE, packBean);
|
||||
DdlPreparedPack.getStringLikerPack(bean.getPrinter(), MesExtConstWords.PRINTER, packBean);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
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<MesInspectionProductDataAmountReportModel> queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager) {
|
||||
pager = PagerHelper.getPager(pager, inspectionProductDataReportDao.queryInspectionProductDataAmountReportCount(model));
|
||||
List<MesInspectionProductDataAmountReportModel> 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);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesProductionRecordReportExtService;
|
||||
import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesProductionRecordReportExtDao;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
|
||||
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
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.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class MesProductionRecordReportExtService implements IMesProductionRecordReportExtService {
|
||||
|
||||
@Autowired
|
||||
private IMesProductionRecordReportExtDao productionRecordReportExtDao;
|
||||
|
||||
/**
|
||||
* 加工记录合并批量汇报查询报表
|
||||
* @param model 查询条件
|
||||
* @param pager 分页条件
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public ListPager<MesProductionRecordReportExtModel> queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel model, Pager pager) {
|
||||
|
||||
List<Integer> reportStatusList = !StringUtils.isEmpty(model.getReportStatusList())
|
||||
? Arrays.asList(model.getReportStatusList().split(MesExtConstWords.COMMA)).stream().map(Integer::parseInt).collect(Collectors.toList()) :
|
||||
Stream.of(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_10.getValue(),
|
||||
MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_20.getValue(),
|
||||
MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_30.getValue(),
|
||||
MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_40.getValue()
|
||||
).collect(Collectors.toList());
|
||||
|
||||
List<Integer> reportStatusList2Pr = null;
|
||||
List<Integer> reportStatusList2Wo = null;
|
||||
if (reportStatusList.contains(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_10.getValue())) {
|
||||
reportStatusList2Pr = new ArrayList<>();
|
||||
reportStatusList2Pr.add(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue());
|
||||
reportStatusList2Pr.add(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue());
|
||||
}
|
||||
if (reportStatusList.contains(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_20.getValue())) {
|
||||
if (CollectionUtils.isEmpty(reportStatusList2Pr)) reportStatusList2Pr = new ArrayList<>();
|
||||
reportStatusList2Pr.add(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_20.getValue());
|
||||
}
|
||||
|
||||
if (StringUtils.isEmpty(model.getWorkCellCode()) && StringUtils.isEmpty(model.getEquipmentCode())) {
|
||||
reportStatusList2Wo = new ArrayList<>();
|
||||
if (reportStatusList.contains(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_30.getValue())) reportStatusList2Wo.add(MesExtEnumUtil.WORK_ORDER_LOG_TYPE.REPORT.getValue());
|
||||
if (reportStatusList.contains(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_40.getValue())) reportStatusList2Wo.add(MesExtEnumUtil.WORK_ORDER_LOG_TYPE.REPORT_ADJUST.getValue());
|
||||
}
|
||||
|
||||
ListPager<MesProductionRecordReportExtModel> listPager = productionRecordReportExtDao.queryProductionRecordUnionWorkOrderLogReport(model, pager, reportStatusList2Pr, reportStatusList2Wo);
|
||||
|
||||
return listPager;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,242 +0,0 @@
|
||||
#\u9879\u76EE\u7AEF\u53E3
|
||||
server.port=8300
|
||||
#\u672C\u673Aip
|
||||
impp.server.ip=localhost
|
||||
#\u94FE\u8DEF\u8FFD\u8E2Azipkin\u63A7\u5236\u53F0ip\u5730\u5740
|
||||
impp.console.ip=http://10.193.30.22:8010
|
||||
################ \u529F\u80FD\u914D\u7F6E1 ################
|
||||
#mes webservice\u5F00\u5173
|
||||
mes.webservice.open=true
|
||||
#\u5DE5\u4F5C\u533AID,\u4E0D\u540C\u670D\u52A1\u5668\u4E0D\u540CID 0 - 31
|
||||
impp.snowflake.work.id=19
|
||||
#\u6570\u636E\u4ED3\u533AID 0 - 31 \u6709\u9ED8\u8BA4\u56FA\u5B9AID
|
||||
impp.snowflake.database.id=11
|
||||
#\u82E5\u65E0\u6CD5\u8FDE\u63A5\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u662F\u5426\u9700\u8981\u4E00\u76F4\u68C0\u6D4B\u52A0\u5165
|
||||
impp.cluster.fetch=false
|
||||
#\u670D\u52A1\u6CE8\u518C\u4E2D\u5FC3
|
||||
impp.cluster.regist.center=http://10.193.30.22:8000/eureka/
|
||||
#\u65E5\u5FD7\u9ED8\u8BA4\u4F7F\u7528log4j2
|
||||
logging.config=classpath:log4j2-spring.xml
|
||||
########\u5E73\u53F0\u76F8\u5173\u53C2\u6570##########
|
||||
#\u662F\u5426\u5F00\u542Fredis\u7F13\u5B58
|
||||
impp.config.redis=true
|
||||
#\u662F\u5426\u5F00\u542Fmongo
|
||||
impp.config.mongo=true
|
||||
#\u662F\u5426\u5F00\u542FrabbitMQ
|
||||
impp.config.rabbitmq=false
|
||||
#\u662F\u5426\u5F00\u542Fswagger
|
||||
impp.config.swagger=true
|
||||
#\u662F\u5426\u5F00\u542Fwebsocket
|
||||
impp.config.websocket=true
|
||||
#\u662F\u5426\u5F00\u542F\u6587\u4EF6\u670D\u52A1
|
||||
impp.config.fileserver=fastdfs
|
||||
#\u662F\u5426\u5BF9\u53D1\u5E03\u670D\u52A1\u8FDB\u884C\u8BE6\u7EC6\u65E5\u5FD7\u5206\u6790
|
||||
impp.log.detail.controller=false
|
||||
#\u662F\u5426\u5BF9\u8C03\u7528\u670D\u52A1\u8FDB\u884C\u8BE6\u7EC6\u65E5\u5FD7\u5206\u6790
|
||||
impp.log.detail.service=false
|
||||
################ \u961F\u5217\u5904\u7406 ################
|
||||
#\u7AD9\u5185\u4FE1
|
||||
impp.mq.queue.letter=true
|
||||
#\u90AE\u4EF6
|
||||
impp.mq.queue.mail=true
|
||||
#\u5B9A\u65F6\u4EFB\u52A1
|
||||
impp.mq.queue.schedule=true
|
||||
#SWEB\u901A\u77E5\u5904\u7406\u961F\u5217
|
||||
impp.mq.queue.sweb.notice=true
|
||||
################################ \u5176\u4ED6\u529F\u80FD\u8BBE\u7F6E ################################
|
||||
#elasticsearch ip \u591A\u4E2A\u7528\u9017\u53F7\u9694\u5F00
|
||||
elasticsearch.ip=10.193.30.22:9200
|
||||
################ FastDfs \u914D\u7F6E ################
|
||||
#tracker\u670D\u52A1\u5668ip
|
||||
fastdfs.tracker_servers=10.193.30.22:22122
|
||||
# tracker\u7684http\u7AEF\u53E3
|
||||
fastdfs.http_tracker_http_port=22122
|
||||
# \u4F7F\u7528\u81EA\u5B9A\u4E49\u5DE5\u5177\u83B7\u53D6\u6587\u4EF6\u5C55\u793A\u5730\u5740
|
||||
fastdfs.http.ui.host=http://dfs.estsh.com
|
||||
#\u5BC6\u7801
|
||||
#fastdfs.http.secret_key=
|
||||
#\u8FDE\u63A5\u8D85\u65F6
|
||||
fastdfs.connect_timeout_in_seconds=500000
|
||||
#\u4F20\u8F93\u8D85\u65F6
|
||||
fastdfs.network_timeout_in_seconds=60000000
|
||||
fastdfs.charset=UTF-8
|
||||
# token \u9632\u76D7\u94FE\u529F\u80FD
|
||||
fastdfs.http_anti_steal_token=no
|
||||
#redisIP
|
||||
redis.hostName=10.193.30.9
|
||||
#\u7AEF\u53E3\u53F7
|
||||
redis.port=6379
|
||||
#\u5982\u679C\u6709\u5BC6\u7801
|
||||
redis.password=(mfLEu7@9kmfdsTy
|
||||
##\u5176\u4ED6redis\u914D\u7F6E\u9700\u8981\u8C03\u6574\u7684\u52A0\u5728\u6B64\u5904
|
||||
################## rabbitMQ\u914D\u7F6E ####################
|
||||
spring.rabbitmq.vhost=/
|
||||
spring.rabbitmq.host=10.193.30.18
|
||||
spring.rabbitmq.port=15672
|
||||
spring.rabbitmq.username=root
|
||||
spring.rabbitmq.password=(mfLEu7@9kmfdsTy
|
||||
##\u5176\u4ED6rabbitMq\u914D\u7F6E\u9700\u8981\u8C03\u6574\u7684\u52A0\u5728\u6B64\u5904
|
||||
################ \u529F\u80FD\u914D\u7F6E2 ################
|
||||
#\u662F\u5426\u5F00\u542Fredis
|
||||
mes.redis.open=true
|
||||
#\u662F\u5426\u5141\u8BB8\u524D\u7AEF\u8DE8\u57DF\u63D0\u4EA4
|
||||
impp.web.cross=true
|
||||
################ \u6388\u6743\u8FC7\u6EE4\u914D\u7F6E ################
|
||||
#\u7528\u6237\u6388\u6743\u8FC7\u6EE4\u8DEF\u5F84
|
||||
filter.shiro.user.filteruri=/mes/operate/*
|
||||
#\u7528\u6237\u6388\u6743\u8FC7\u6EE4\u8DEF\u5F84
|
||||
filter.shiro.admin.filteruri=/mes/adoperate/*
|
||||
#\u7528\u6237\u6388\u6743\u8FC7\u6EE4\u8DEF\u5F84
|
||||
filter.shiro.saadmin.filteruri=/mes/saoperate/*
|
||||
################ \u4E91\u914D\u7F6E \uFF08\u4EE5projectName\u4F5C\u4E3A\u5E94\u7528\u540D\uFF09 ################
|
||||
#\u662F\u5426\u5F00\u542F\u5FAE\u670D
|
||||
eureka.client.enabled=false
|
||||
#\uFF08\u53C2\u6570\u914D\u7F6E\uFF09\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740 -\u300B i3plus-ics\uFF0C\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694
|
||||
eureka.client.service-url.defaultZone=${impp.cluster.regist.center}
|
||||
#\u533A\u57DF\uFF08\u6E90\u7801\u4E2D\u5305\u542BdefaultZone\uFF0C\u6240\u4EE5\u9ED8\u8BA4\u4F7F\u7528defaultZone\uFF09
|
||||
#eureka.client.region=estsh
|
||||
#eureka.client.service-url.estsh:http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/
|
||||
################ \u672C\u673A\u5FAE\u670D\u914D\u7F6E ################
|
||||
#\u672C\u670D\u52A1\u4E3B\u673Aip\uFF08\u82E5\u591A\u4E2A\u7F51\u5361\uFF0C\u5219\u9700\u8981\u8BBE\u7F6E\u672C\u670D\u52A1ip\uFF09
|
||||
eureka.instance.ip-address=${impp.server.ip}
|
||||
#\u672C\u670D\u52A1\u5B9E\u4F8BID
|
||||
eureka.instance.instance-id=${impp.server.ip}:${server.port}
|
||||
#\u672C\u670D\u52A1\u4E3B\u673A\u540D
|
||||
eureka.instance.hostname=${impp.server.ip}
|
||||
#\u672C\u670D\u52A1\u72B6\u6001\u9875\u9762
|
||||
eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html
|
||||
#\u5C06\u81EA\u5DF1\u7684IP\u6CE8\u518C\u5230Eureka Server\u3002\u82E5\u4E0D\u914D\u7F6E\u6216\u8BBE\u7F6E\u4E3Afalse\uFF0C\u8868\u793A\u6CE8\u518C\u5FAE\u670D\u52A1\u6240\u5728\u64CD\u4F5C\u7CFB\u7EDF\u7684hostname\u5230Eureka Server
|
||||
eureka.instance.prefer-ip-address=true
|
||||
#\u662F\u5426\u8FDB\u884C\u5065\u5EB7\u68C0\u67E5
|
||||
eureka.client.healthcheck.enabled=true
|
||||
################ \u68C0\u6D4B\u673A\u5236 ################
|
||||
#\u5FC3\u8DF3\u95F4\u9694\u5468\u671F\uFF0C\u5B95\u673A\u9650\u5236\uFF08\u79D2\uFF09\uFF0C30\u79D2\u6CA1\u53CD\u5E94\u89C6\u4E3A\u5B95\u673A
|
||||
eureka.instance.lease-expiration-duration-in-seconds=30
|
||||
#\u5FC3\u8DF3\u5468\u671F
|
||||
eureka.instance.lease-renewal-interval-in-seconds=20
|
||||
#client\u8FDE\u63A5Eureka\u670D\u52A1\u7AEF\u540E\u7684\u7A7A\u95F2\u7B49\u5F85\u65F6\u95F4\uFF0C\u9ED8\u8BA4\u4E3A30 \u79D2
|
||||
eureka.client.eureka-connection-idle-timeout-seconds=1
|
||||
#\u6700\u521D\u590D\u5236\u5B9E\u4F8B\u4FE1\u606F\u5230eureka\u670D\u52A1\u5668\u6240\u9700\u7684\u65F6\u95F4\uFF08s\uFF09\uFF0C\u9ED8\u8BA4\u4E3A40\u79D2
|
||||
eureka.client.initial-instance-info-replication-interval-seconds=1
|
||||
#\u95F4\u9694\u591A\u957F\u65F6\u95F4\u518D\u6B21\u590D\u5236\u5B9E\u4F8B\u4FE1\u606F\u5230eureka\u670D\u52A1\u5668\uFF0C\u9ED8\u8BA4\u4E3A30\u79D2
|
||||
eureka.client.instance-info-replication-interval-seconds=1
|
||||
#\u4ECEeureka\u670D\u52A1\u5668\u6CE8\u518C\u8868\u4E2D\u83B7\u53D6\u6CE8\u518C\u4FE1\u606F\u7684\u65F6\u95F4\u95F4\u9694\uFF08s\uFF09\uFF0C\u9ED8\u8BA4\u4E3A30\u79D2
|
||||
eureka.client.registry-fetch-interval-seconds=1
|
||||
################ \u6253\u5F00feign\u7684\u7194\u65AD ################
|
||||
feign.hystrix.enabled=true
|
||||
#\u8BFB\u53D6\u6570\u636E\u65F6\u957F
|
||||
ribbon.ReadTimeout=100000
|
||||
#\u8FDE\u63A5\u65F6\u957F
|
||||
ribbon.ConnectTimeout=100000
|
||||
#\u91CD\u8BD5
|
||||
ribbon.maxAutoRetries=2
|
||||
#\u54CD\u5E94\u8D85\u8FC7\u65F6\u957F\uFF0C\u8FDB\u884C\u7194\u65AD\uFF08\u7194\u65AD\u8D85\u65F6\u9700\u8981\u5927\u4E8E\u8BFB\u53D6\u65F6\u957F\u53CA\u8FDE\u63A5\u65F6\u957F\uFF09
|
||||
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=150000
|
||||
#\u96C6\u7FA4\u540D
|
||||
eureka.instance.metadata-map.cluster=impp_cluster
|
||||
################ \u94FE\u8DEF\u8FFD\u8E2A ################
|
||||
#\u4F7F\u7528web\u65B9\u5F0F\u4F20\u8F93\u4FE1\u606F
|
||||
spring.zipkin.sender.type=web
|
||||
#\u94FE\u8DEF\u8FFD\u8E2A\u670D\u52A1\u7684\u5730\u5740
|
||||
spring.zipkin.base-url=${impp.console.ip}
|
||||
#\u8FFD\u8E2A\u6DF1\u5EA6\uFF0C\u767E\u5206\u6BD4\uFF0C1\u662F\u5168\u90E8
|
||||
spring.sleuth.sampler.probability=1.0
|
||||
################ \u65E5\u5FD7\u636E\u6E90 ################
|
||||
spring.data.mongodb.database=mongoDBSource
|
||||
spring.data.mongodb.uri=10.193.30.22:27017
|
||||
spring.data.mongodb.username=sa
|
||||
spring.data.mongodb.password=i3plus
|
||||
spring.data.mongodb.port=27017
|
||||
################ \u4E3B\u6570\u636E\u6E90 ################
|
||||
|
||||
##############\u5B9A\u65F6\u4EFB\u52A1\u6301\u4E45\u5316##############
|
||||
impp.schedule.open=true
|
||||
impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver
|
||||
impp.schedule.datasource.jdbc-url=jdbc:mysql://10.193.30.20:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
|
||||
impp.schedule.datasource.username=root
|
||||
impp.schedule.datasource.password=(mfLEu7@9kmfdsTy
|
||||
impp.schedule.datasource.max-connections=20
|
||||
#\u5B9A\u65F6\u4EFB\u52A1\u5728\u670D\u52A1\u542F\u52A8\u540E\u591A\u5C11\u79D2\u6267\u884C
|
||||
impp.schedule.start.after-second=20
|
||||
#\u662F\u5426\u96C6\u7FA4\u90E8\u7F72
|
||||
impp.schedule.datasource.is-clustered=true
|
||||
#\u6267\u884C\u68C0\u6D4B\uFF08\u6BEB\u79D2\uFF09\uFF0C\u82E5\u5B95\u673A\u7531\u5176\u4ED6\u5B9A\u65F6\u5668\u6267\u884C
|
||||
impp.schedule.datasource.cluster-checkin-interval=30000
|
||||
#\u7EBF\u7A0B\u6570
|
||||
impp.schedule.thread-count=10
|
||||
#\u7EBF\u7A0B\u4F18\u5148\u7EA7\uFF081-10\uFF09\u9ED8\u8BA4\u4E3A5
|
||||
impp.schedule.thread-priority=5
|
||||
################ \u6570\u636E\u6C60\u8BBE\u7F6E ################
|
||||
## \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF0C\u9ED8\u8BA4\u662F10
|
||||
spring.datasource.hikari.maximum-pool-size=100
|
||||
## \u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570\u91CF
|
||||
spring.datasource.hikari.minimum-idle=10
|
||||
## \u7A7A\u95F2\u8FDE\u63A5\u5B58\u6D3B\u6700\u5927\u65F6\u95F4\uFF0C\u9ED8\u8BA4600000\uFF0810\u5206\u949F\uFF09
|
||||
spring.datasource.hikari.idle-timeout=600000
|
||||
## \u6B64\u5C5E\u6027\u63A7\u5236\u6C60\u4E2D\u8FDE\u63A5\u7684\u6700\u957F\u751F\u547D\u5468\u671F\uFF0C\u503C0\u8868\u793A\u65E0\u9650\u751F\u547D\u5468\u671F\uFF0C\u9ED8\u8BA41800000\u537330\u5206\u949F
|
||||
spring.datasource.hikari.max-lifetime=1800000
|
||||
## \u6570\u636E\u5E93\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4,\u9ED8\u8BA430\u79D2\uFF0C\u537330000
|
||||
spring.datasource.hikari.connection-timeout=30000
|
||||
################ JPA\u8BBE\u7F6E\u8BBE\u7F6E ################
|
||||
# mysql
|
||||
spring.jpa.database=MYSQL
|
||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
|
||||
##Sql-server##
|
||||
#spring.jpa.database=sql_server
|
||||
#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServerDialect
|
||||
##oracle##
|
||||
#spring.jpa.database=oracle
|
||||
#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
|
||||
# mysql
|
||||
spring.datasource.validationQuery=SELECT 1
|
||||
##Sql-server##
|
||||
# spring.datasource.validationQuery=SELECT 1
|
||||
##oracle##
|
||||
# spring.datasource.validationQuery=SELECT 1 FROM DUAL
|
||||
#ImprovedNamingStrategy / physical_naming_strategy java\u5C5E\u6027\u6620\u5C04\u5230\u6570\u636E\u5E93\u5B57\u6BB5\u65F6\u547D\u540D\u89C4\u5219
|
||||
# spring.jpa.properties.hibernate.physical_naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy/org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
|
||||
#\u8868\u5173\u7CFBcreate,create-drop,update,validate
|
||||
spring.jpa.properties.hibernate.hbm2ddl.auto=none
|
||||
#\u662F\u5426\u663E\u793Asql
|
||||
spring.jpa.show-sql=true
|
||||
################ \u6388\u6743\u914D\u7F6E ################
|
||||
slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
|
||||
slm.app.id=20190513
|
||||
###################\uFFFD\uFFFD\u013F\uFFFD\uFFFD\uFFFD\u077F\uFFFD\u02B5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD##################################################
|
||||
project.entity.path=cn.estsh.i3plus.pojo
|
||||
|
||||
|
||||
impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
|
||||
impp.write.datasource.jdbc-url=jdbc:mysql://10.193.30.20:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
|
||||
impp.write.datasource.username=root
|
||||
impp.write.datasource.password=(mfLEu7@9kmfdsTy
|
||||
impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
|
||||
impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
|
||||
impp.read.datasource.jdbc-url=jdbc:mysql://10.193.30.20:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
|
||||
impp.read.datasource.username=root
|
||||
impp.read.datasource.password=(mfLEu7@9kmfdsTy
|
||||
|
||||
|
||||
|
||||
#impp.schedule.scheduleType=xxljob
|
||||
#xxl.job.admin.addresses=http://10.193.30.22:10010/xxl-job-admin
|
||||
#### xxl-job, access token
|
||||
#xxl.job.accessToken=
|
||||
#### xxl-job executor appname
|
||||
##xxl.job.executor.appname=${project.name}
|
||||
#xxl.job.executor.appname=i3mes-castle
|
||||
#### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
|
||||
#xxl.job.executor.address=
|
||||
#### xxl-job executor server-info
|
||||
#xxl.job.executor.ip=172.24.96.1
|
||||
##xxl.job.executor.ip=
|
||||
##xxl.job.executor.port=9999
|
||||
#xxl.job.executor.port=8888
|
||||
#### xxl-job executor log-path
|
||||
#xxl.job.executor.logpath=
|
||||
#### xxl-job executor log-retention-days
|
||||
#xxl.job.executor.logretentiondays=10
|
||||
#xxl.job.basePackage=cn.estsh.i3plus.ext.mes.apiservice.schedulejob
|
||||
|
||||
|
||||
impp.app.ext.base-packages=cn.estsh.i3plus.ext.mes.apiservice
|
||||
@ -1,153 +0,0 @@
|
||||
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.reworkOrder = reworkOrder;
|
||||
this.modifyUser = modifyUser;
|
||||
this.partTypeCode = partTypeCode;
|
||||
this.workCenterName = workCenterName;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
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 MesProductionRecordReportExtModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 7580273561023637832L;
|
||||
|
||||
@ApiParam(value = "组织代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam(value = "物料编号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam(value = "物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("生产线代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam(value = "工位代码")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam(value = "数量")
|
||||
private Integer qty;
|
||||
|
||||
@ApiParam("班次代码")
|
||||
private String shiftCode;
|
||||
|
||||
@ApiParam(value = "设备代码")
|
||||
public String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam(value = "汇报状态")
|
||||
private String reportStatusList;
|
||||
|
||||
@ApiParam(value = "完成时间开始日期")
|
||||
private String completeDateTimeStart;
|
||||
|
||||
@ApiParam(value = "完成时间结束日期")
|
||||
private String completeDateTimeEnd;
|
||||
|
||||
//1=加工记录 2=工单日志批量汇报
|
||||
@ApiParam("数据来源")
|
||||
private Integer dataSource;
|
||||
|
||||
@ApiParam("汇报状态")
|
||||
private Integer reportStatus;
|
||||
|
||||
@ApiParam("汇报状态名称")
|
||||
private String reportStatusName;
|
||||
|
||||
public MesProductionRecordReportExtModel() {}
|
||||
|
||||
public MesProductionRecordReportExtModel(Object workCenterCode, Object workCellCode, Object partNo, Object partName, Object shiftCode, Object equipmentCode, Object equipmentName, Object reportStatus, Object dataSource, Object qty) {
|
||||
if (!StringUtils.isEmpty(workCenterCode)) this.workCenterCode = (String) workCenterCode;
|
||||
if (!StringUtils.isEmpty(workCellCode)) this.workCellCode = (String) workCellCode;
|
||||
if (!StringUtils.isEmpty(partNo)) this.partNo = (String) partNo;
|
||||
if (!StringUtils.isEmpty(partName)) this.partName = (String) partName;
|
||||
if (!StringUtils.isEmpty(shiftCode)) this.shiftCode = (String) shiftCode;
|
||||
if (!StringUtils.isEmpty(equipmentCode)) this.equipmentCode = (String) equipmentCode;
|
||||
if (!StringUtils.isEmpty(equipmentName)) this.equipmentName = (String) equipmentName;
|
||||
if (!StringUtils.isEmpty(reportStatus)) this.reportStatus = Integer.valueOf(reportStatus.toString());
|
||||
if (!StringUtils.isEmpty(dataSource)) this.dataSource = Integer.valueOf(dataSource.toString());
|
||||
if (!StringUtils.isEmpty(qty)) this.qty = Double.valueOf(qty.toString()).intValue();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue