diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java index e866640cb..ae1058e36 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java @@ -143,6 +143,7 @@ public interface QcStaticTableMapper { Map getBPDefectMothMap(QcStaticTable qcStaticTable); QcStaticTable getBPHzInfo(QcStaticTable qcStaticTable); + QcStaticTable getBPHzInfoPC(QcStaticTable qcStaticTable); @MapKey("ymdms") Map getBPDefectMothPCMap(QcStaticTable qcStaticTable); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index f3254b30b..470ec44cd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -1961,18 +1961,18 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { dto.setColumn090100(qcStaticTable.getYearMonth().split("-")[1]); dto.setMaterialName("白坯"); dto.setWorkCenter("白坯车间"); - QcStaticTable hzdto = qcStaticTableMapper.getBPHzInfo(qcStaticTable); + QcStaticTable hzdto = qcStaticTableMapper.getBPHzInfoPC(qcStaticTable); dto.setSampleQty(hzdto.getSampleQty()); - dto.setNoOkNums(hzdto.getNoOkNums()); + dto.setNoOkQty(hzdto.getNoOkQty()); dto.setNoOkNumRate( - new BigDecimal(hzdto.getNoOkNums()) + new BigDecimal(hzdto.getNoOkQty()) .multiply(new BigDecimal("100")) .divide(new BigDecimal(hzdto.getSampleQty()),2,BigDecimal.ROUND_HALF_UP)+"%" ); dto.setOkNumRate( new BigDecimal("100") .subtract( - new BigDecimal(hzdto.getNoOkNums()) + new BigDecimal(hzdto.getNoOkQty()) .multiply(new BigDecimal("100")) .divide(new BigDecimal(hzdto.getSampleQty()),2,BigDecimal.ROUND_HALF_UP) )+"%" 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 b105b374d..da711da6f 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 @@ -1303,5 +1303,28 @@ and bp.product_group_name ='白坯' and bp.del_flag = '0' and bp.product_desc_zh like '%白坯%' ) t - +