From d082384d27b42e6594a9dfb4e8daaf14497344e3 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 23 Aug 2024 10:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=8A=A5=E8=A1=A8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/domain/vo/MesDailyReportVo.java | 10 ++++- .../op/mes/mapper/MesReportWorkMapper.java | 2 + .../impl/MesReportWorkServiceImpl.java | 6 +++ .../mapper/mes/MesReportWorkMapper.xml | 8 ++++ .../QcDefectTypeClassController.java | 7 ++++ .../controller/QcDefectTypeController.java | 7 ++++ .../com/op/quality/domain/QcDefectType.java | 9 +++++ .../op/quality/domain/QcDefectTypeClass.java | 9 +++++ .../mapper/QcDefectTypeClassMapper.java | 2 + .../op/quality/mapper/QcDefectTypeMapper.java | 2 + .../service/IQcDefectTypeClassService.java | 2 + .../quality/service/IQcDefectTypeService.java | 3 ++ .../impl/QcCheckTaskIncomeServiceImpl.java | 19 +++++++-- .../impl/QcDefectTypeClassServiceImpl.java | 5 ++- .../service/impl/QcDefectTypeServiceImpl.java | 8 ++++ .../quality/QcCheckTaskIncomeMapper.xml | 10 ++++- .../quality/QcCheckUnqualifiedMapper.xml | 11 ++++- .../quality/QcDefectTypeClassMapper.xml | 8 ++++ .../mapper/quality/QcDefectTypeMapper.xml | 40 ++++++++++--------- .../mapper/quality/QcStaticTableMapper.xml | 7 +++- 20 files changed, 146 insertions(+), 29 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java index 3d17560e..cf2fb73b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java @@ -95,10 +95,18 @@ public class MesDailyReportVo extends BaseEntity { private String workCenter; private String equipmentTypeCode; - + private String reason; private String machineCode; private BigDecimal reportRate; + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + public BigDecimal getReportRate() { return reportRate; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 60250a8b..dd30bbac 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -188,4 +188,6 @@ public interface MesReportWorkMapper { //当月产线产量汇总 //当月产线品类汇总 List getmonthProductionSutCategory(MesMonthReportVo mesMonthReportVo); + + String getProductReason(QuantityDto quantityDto); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index 4c6bc814..8b31813d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -424,6 +424,12 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { quantityDto.setWorkorderCode(workorderCode); quantityDto.setMachineCode(machineCode); + //影响效率原因 + String reasons = mesReportWorkMapper.getProductReason(quantityDto); + if(!reasons.equals(";;")&&StringUtils.isNotBlank(reasons)){ + dto.setReason(reasons); + } + QuantityDto parentMesReport = mesReportWorkMapper.getRealQuantity(quantityDto); QuantityDto sonMesReport = mesReportWorkMapper.getSumQuantity(quantityDto); if(sonMesReport == null){//单层工单的情况 diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index d132b6be..71f13f3f 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -953,6 +953,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into mes_report_work diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java index 90f4db30..f2c25f75 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java @@ -104,4 +104,11 @@ public class QcDefectTypeClassController extends BaseController { List list = qcDefectTypeClassService.getClassInfoList(qcDefectTypeClass); return success(list); } + + @GetMapping("/getClassInfoListByCheckType") + @DS("#header.poolName") + public AjaxResult getClassInfoListByCheckType(QcDefectTypeClass qcDefectTypeClass) { + List list = qcDefectTypeClassService.getClassInfoListByCheckType(qcDefectTypeClass); + return success(list); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java index 5a0405d2..abd4b9ef 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java @@ -8,6 +8,7 @@ import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.common.security.annotation.RequiresPermissions; +import com.op.quality.domain.QcCheckType; import com.op.quality.domain.QcDefectType; import com.op.quality.service.IQcDefectTypeService; import org.springframework.beans.factory.annotation.Autowired; @@ -95,4 +96,10 @@ public class QcDefectTypeController extends BaseController { List list = qcDefectTypeService.getDefectTypeListByDefectType(defectType); return getDataTable(list); } + + @GetMapping("/getCheckTypes") + public List getCheckTypes(QcCheckType qcCheckType) { + List list = qcDefectTypeService.getCheckTypes(qcCheckType); + return list; + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java index 5c29f66f..f8ce9955 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java @@ -75,9 +75,18 @@ public class QcDefectType extends BaseEntity { // 创建日期结束 private String createTimeEnd; private String checkType; + private String checkName; private BigDecimal ratio; + public String getCheckName() { + return checkName; + } + + public void setCheckName(String checkName) { + this.checkName = checkName; + } + public String getCheckType() { return checkType; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java index 4d782302..65ce2329 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java @@ -48,6 +48,15 @@ private static final long serialVersionUID=1L; /** 删除标志 */ private String delFlag; private String sort; + private String checkType; + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } public String getSort() { return sort; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java index cf850f31..7891acc6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java @@ -61,4 +61,6 @@ public interface QcDefectTypeClassMapper { public int deleteQcDefectTypeClassByIds(String[] ids); List getClassInfoList(QcDefectTypeClass qcDefectTypeClass); + + List getClassInfoListByCheckType(QcDefectTypeClass qcDefectTypeClass); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java index 8cd9a982..ebe3bf4b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java @@ -1,5 +1,6 @@ package com.op.quality.mapper; +import com.op.quality.domain.QcCheckType; import com.op.quality.domain.QcDefectType; import org.apache.ibatis.annotations.Mapper; @@ -70,4 +71,5 @@ public interface QcDefectTypeMapper { public List getDefectTypeListByDefectType(String defectType); + List getCheckTypes(QcCheckType qcCheckType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java index 2705f3fb..6c1e491f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java @@ -62,4 +62,6 @@ public interface IQcDefectTypeClassService { public int deleteQcDefectTypeClassById(String id); List getClassInfoList(QcDefectTypeClass qcDefectTypeClass); + + List getClassInfoListByCheckType(QcDefectTypeClass qcDefectTypeClass); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java index 3e81172b..864cf5d3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java @@ -1,6 +1,7 @@ package com.op.quality.service; import com.op.common.core.web.domain.AjaxResult; +import com.op.quality.domain.QcCheckType; import com.op.quality.domain.QcDefectType; import java.util.List; @@ -61,4 +62,6 @@ public interface IQcDefectTypeService { public int deleteQcDefectTypeByDefectId(String defectId); public List getDefectTypeListByDefectType(String defectType); + + List getCheckTypes(QcCheckType qcCheckType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 0a8005d7..f72755d3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -800,7 +800,11 @@ public class QcCheckTaskIncomeServiceImpl implements defect = new QcCheckTaskDefect(); defect.setDefectCode(defectCodes[d]); defect.setDefectSubclass(defectNames[d].split(":")[0]); - defect.setClassId(classIds[d]); + if(d < classIds.length){ + defect.setClassId(classIds[d]); + }else{ + defect.setClassId(""); + } defect.setNoOkQuality(new BigDecimal(defectQualitys[d])); defect.setRecordId(IdUtils.fastSimpleUUID()); defect.setCreateTime(nowTime); @@ -928,7 +932,11 @@ public class QcCheckTaskIncomeServiceImpl implements defect.setDefectCode(defectCodes[d]); defect.setDefectSubclass(defectNames[d].split(":")[0]); defect.setNoOkQuality(new BigDecimal(defectQualitys[d])); - defect.setClassId(classIds[d]); + if(d < classIds.length){ + defect.setClassId(classIds[d]); + }else{ + defect.setClassId(""); + } defect.setRecordId(IdUtils.fastSimpleUUID()); defect.setCreateTime(nowTime); defect.setCreateBy(updateBy); @@ -1211,7 +1219,10 @@ public class QcCheckTaskIncomeServiceImpl implements } public static void main(String args[]){ - QcCheckTaskIncomeServiceImpl impl = new QcCheckTaskIncomeServiceImpl(); - System.out.println(impl.getConvertUnit("ST")); + String str = "11,,22,"; + System.out.println(str.split(",")[0]); + System.out.println(str.split(",")[1]); + System.out.println(str.split(",")[2]); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java index 49bf3e06..4e806db9 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java @@ -107,5 +107,8 @@ public class QcDefectTypeClassServiceImpl implements IQcDefectTypeClassService { return qcDefectTypeClassMapper.getClassInfoList(qcDefectTypeClass); } - + @Override + public List getClassInfoListByCheckType(QcDefectTypeClass qcDefectTypeClass) { + return qcDefectTypeClassMapper.getClassInfoListByCheckType(qcDefectTypeClass); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java index ea07ae0d..5fa0c625 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java @@ -5,6 +5,7 @@ import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.quality.domain.QcCheckType; import com.op.quality.domain.QcDefectType; import com.op.quality.mapper.QcDefectTypeMapper; import com.op.quality.service.IQcDefectTypeService; @@ -172,4 +173,11 @@ public class QcDefectTypeServiceImpl implements IQcDefectTypeService { public List getDefectTypeListByDefectType(String defectType) { return qcDefectTypeMapper.getDefectTypeListByDefectType(defectType); } + + @Override + @DS("#header.poolName") + public List getCheckTypes(QcCheckType qcCheckType) { + return qcDefectTypeMapper.getCheckTypes(qcCheckType); + } + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index a1a6502c..fa37c7b2 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -570,13 +570,19 @@ order by qctd.defect_code diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml index 720767d8..1812b2d0 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml @@ -68,6 +68,14 @@ and del_flag = '0' order by sort + insert into qc_defect_type_class diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml index 1cfd69dc..6a7a029a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml @@ -20,6 +20,8 @@ + + @@ -30,30 +32,29 @@ + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index c216ba46..7bbeff11 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -491,10 +491,15 @@ GROUP by qctd.belong_to,qctd.belong_to_detail