diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index 83487f91b..f05fd3e65 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -29,7 +29,7 @@ public class EquOrder extends BaseEntity { /** * 计划id */ - @Excel(name = "计划id") +// @Excel(name = "计划id") private String planId; /** @@ -290,9 +290,13 @@ public class EquOrder extends BaseEntity { private String createTimeEnd; //合格率 + @Excel(name = "合格率") private String complianceRate; - public String getPicturePath() { + //设备类型编码 安环三个报表要用 + private String equipmentTypeCode; + + public String getPicturePath() { return picturePath; } @@ -829,11 +833,15 @@ public class EquOrder extends BaseEntity { } public String getComplianceRate() { return complianceRate; } - public void setComplianceRate(String complianceRate) { this.complianceRate = complianceRate; } + public String getEquipmentTypeCode() { return equipmentTypeCode; } + public void setEquipmentTypeCode(String equipmentTypeCode) { + this.equipmentTypeCode = equipmentTypeCode; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 7f2cdcffe..2f4f953bd 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -152,6 +152,7 @@ and CONVERT(date,eo.order_end) >= #{orderEndArrayStart} and #{orderEndArrayEnd} >= CONVERT(date,eo.order_end) and ep.plan_name like concat('%', #{planName}, '%') + and be.equipment_type_code like concat('%',#{equipmentTypeCode}, '%') and eo.del_flag = '0' and be.del_flag = '0' and ep.del_flag = '0' order by eo.create_time desc diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 5863a6a73..6c2f8b88b 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1384,6 +1384,9 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { dtos = proOrderWorkorderMapper.getPreIdCardListB(proOrderWorkorder); dtos.get(0).setUmrez(dtos.get(0).getBatchQuantity().multiply(dtos.get(0).getUmrez()));//子单数量 } + for(ProOrderWorkorder pow:dtos){ + pow.setProductCode(pow.getProductCode().substring(7)); + } return dtos; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java index 763c53da4..8d1c02876 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java @@ -589,5 +589,12 @@ public class QcStaticTableController extends BaseController { util.exportExcel(response, list, "巡检检验结果明细"); } - + /** + * 定量值分析--表头--产品名称 + **/ + @GetMapping("/getDLTableMXList") + @Log(title = "定量值分析明细", businessType = BusinessType.QUERY) + public QcStaticTable getDLTableMXList(QcStaticTable qcStaticTable) { + return qcStaticTableService.getDLTableMXList(qcStaticTable); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java index aa3f91bbc..f45fb9e6f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java @@ -114,6 +114,24 @@ public class QcStaticTable extends BaseEntity { private BigDecimal downDiff; private List columns1; private List columns2; + private String incomeTimeStart; + private String incomeTimeEnd; + + public String getIncomeTimeStart() { + return incomeTimeStart; + } + + public void setIncomeTimeStart(String incomeTimeStart) { + this.incomeTimeStart = incomeTimeStart; + } + + public String getIncomeTimeEnd() { + return incomeTimeEnd; + } + + public void setIncomeTimeEnd(String incomeTimeEnd) { + this.incomeTimeEnd = incomeTimeEnd; + } public Double getNoOkBatchRateVal() { return noOkBatchRateVal; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java index 1523b4c46..ac9a366fa 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java @@ -67,4 +67,6 @@ public interface IQcStaticTableService { List exportIncomeDetail(QcStaticTable qcStaticTable); List exportXJDetail(QcStaticTable qcStaticTable); + + QcStaticTable getDLTableMXList(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 1989db289..f089faadf 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 @@ -188,6 +188,27 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return qcStaticTableMapper.getXJDetail(qcStaticTable); } + @Override + @DS("#header.poolName") + public QcStaticTable getDLTableMXList(QcStaticTable qcStaticTable) { + QcStaticTable dto = new QcStaticTable(); + //第一列日期 + List days = this.getDays(qcStaticTable.getYmArrayStart(), + qcStaticTable.getYmArrayEnd(), "ymd"); + qcStaticTable.setDataType("ymd"); + +// List titleList = qcStaticTableMapper.getDLTableTitle(qcStaticTable); +// //表头：第一行 +// List colName1 = titleList.stream().map(QcStaticTable::getMaterialName).distinct().collect(Collectors.toList()); +// dto.setTitleCol1(colName1); + + //列表数据 + List dxData = new ArrayList<>(); + + dto.setDxData(dxData); + + return dto; + } /** * 不良率 = (A类*1+B类*0.65+C类*0.35)/抽样总数 * @@ -728,18 +749,18 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } dto.setDxData(dxData); - //给折线图取上下限制 - if(qcStaticTable.getProjectNoArray()!=null){ - qcStaticTable.setProjectNo(qcStaticTable.getProjectNoArray()[0]); - QcStaticTable upandown = qcStaticTableMapper.getUpAndDown(qcStaticTable); - if(upandown!=null){ - dto.setUpperDiff(upandown.getUpperDiff()); - dto.setDownDiff(upandown.getDownDiff()); - }else{ - dto.setUpperDiff(BigDecimal.ZERO); - dto.setDownDiff(BigDecimal.ZERO); - } - } +// //给折线图取上下限制 +// if(qcStaticTable.getProjectNoArray()!=null){ +// qcStaticTable.setProjectNo(qcStaticTable.getProjectNoArray()[0]); +// QcStaticTable upandown = qcStaticTableMapper.getUpAndDown(qcStaticTable); +// if(upandown!=null){ +// dto.setUpperDiff(upandown.getUpperDiff()); +// dto.setDownDiff(upandown.getDownDiff()); +// }else{ +// dto.setUpperDiff(BigDecimal.ZERO); +// dto.setDownDiff(BigDecimal.ZERO); +// } +// } return dto; } @@ -1165,6 +1186,8 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return days; } + + public static void main(String args[]){ String ymd = "1、0.4016"; System.out.println(ymd.substring(2)); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml index 61be57141..b653f29b7 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml @@ -292,7 +292,7 @@ wms_fp_storage_news_sn.wh_code ) t --> - select t0.orderNo, + select t.order_no orderNo, t.material_code materialCode, t.material_name materialName, @@ -322,8 +322,9 @@ where bp.warehouse_cycle is not null and t.check_type in('checkTypeLL','checkTypeCP') and t.del_flag = '0' and t.material_code like concat('%',#{materialCode}, '%') and t.material_name like concat('%',#{materialName}, '%') - )t0 - where t0.days >= t0.warehouse_cycle + - and product_code like concat('%', #{productCode},'%') - and product_desc_zh like concat('%',#{productDescZh}, '%') - and product_model = #{productModel} - and product_desc_en = #{productDescEn} - and rule_code = #{ruleCode} - and old_product_code = #{oldProductCode} - and parts_product_code = #{partsProductCode} - and sku_barcode = #{skuBarcode} - and length = #{length} - and width = #{width} - and height = #{height} - and gross_weight = #{grossWeight} - and net_weight = #{netWeight} - and tare_weight = #{tareWeight} - and volume = #{volume} - and unit_price = #{unitPrice} - and product_group = #{productGroup} - and product_group_name like concat('%',#{productGroupName}, '%') - and user_defined1 = #{userDefined1} - and user_defined2 = #{userDefined2} - and user_defined3 = #{userDefined3} - and user_defined4 = #{userDefined4} - and user_defined5 = #{userDefined5} - and user_defined6 = #{userDefined6} - and factory_code = #{factoryCode} - and active_flag = #{activeFlag} - and sync_flag = #{syncFlag} - and primary_uom = #{primaryUom} - and bstme = #{bstme} - and basic_order = #{basicOrder} - and conv_order = #{convOrder} - and ausme = #{ausme} - and basic_issue = #{basicIssue} - and conv_issue = #{convIssue} - and append_flag = #{appendFlag} - and append_percent = #{appendPercent} - and mtart = #{mtart} - and report_rate = #{reportRate} - and del_flag = '0' + and bp.product_code like concat('%', #{productCode},'%') + and bp.product_desc_zh like concat('%',#{productDescZh}, '%') + and bp.product_model = #{productModel} + and bp.product_desc_en = #{productDescEn} + and bp.rule_code = #{ruleCode} + and bp.old_product_code = #{oldProductCode} + and bp.parts_product_code = #{partsProductCode} + and bp.sku_barcode = #{skuBarcode} + and bp.length = #{length} + and bp.width = #{width} + and bp.height = #{height} + and bp.gross_weight = #{grossWeight} + and bp.net_weight = #{netWeight} + and bp.tare_weight = #{tareWeight} + and bp.volume = #{volume} + and bp.unit_price = #{unitPrice} + and bp.product_group = #{productGroup} + and bp.product_group_name like concat('%',#{productGroupName}, '%') + and bp.user_defined1 = #{userDefined1} + and bp.user_defined2 = #{userDefined2} + and bp.user_defined3 = #{userDefined3} + and bp.user_defined4 = #{userDefined4} + and bp.user_defined5 = #{userDefined5} + and bp.user_defined6 = #{userDefined6} + and bp.factory_code = #{factoryCode} + and bp.active_flag = #{activeFlag} + and bp.sync_flag = #{syncFlag} + and bp.primary_uom = #{primaryUom} + and bp.bstme = #{bstme} + and bp.basic_order = #{basicOrder} + and bp.conv_order = #{convOrder} + and bp.ausme = #{ausme} + and bp.basic_issue = #{basicIssue} + and bp.conv_issue = #{convIssue} + and bp.append_flag = #{appendFlag} + and bp.append_percent = #{appendPercent} + and bp.mtart = #{mtart} + and bp.report_rate = #{reportRate} + and bp.mvgr5 like concat('%', #{mvgr5},'%') + and bp.del_flag = '0' - order by product_code asc + order by bp.product_code asc