diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java index 59646ec0c..bbce241d3 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java @@ -136,6 +136,15 @@ public class QcCheckTaskIncomeDTO extends BaseEntity { private BigDecimal bNoOkquality; private BigDecimal cNoOkquality; private String orderType; + private String orderTypeDesc; + + public String getOrderTypeDesc() { + return orderTypeDesc; + } + + public void setOrderTypeDesc(String orderTypeDesc) { + this.orderTypeDesc = orderTypeDesc; + } public String getOrderType() { return orderType; 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 a17fb24a3..595d4cbcf 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 @@ -1,5 +1,6 @@ package com.op.mes.mapper; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -144,4 +145,6 @@ public interface MesReportWorkMapper { int updateAttr2(MesReportWork workorder); void updateReportRemark(@Param("list") List mesReportWork); + + BigDecimal getReportRate(String productCode); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index a5ae95022..a11e4b73f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -37,6 +37,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; @@ -372,6 +373,13 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { if(sHzWorks==null){ return R.fail("未查询到子报工单"); } + //查询base_product的report_rate//箱子-大盒-小盒 + BigDecimal reportRate = mesReportWorkMapper.getReportRate(workOrders.get(0).getProductCode()); + if(reportRate != null){ + BigDecimal newQuantity = sHzWorks.getQuantityFeedback().divide(reportRate,2, RoundingMode.HALF_UP); + sHzWorks.setQuantityFeedback(newQuantity); + } + //子工单报工 logger.info("==========================子工单报工开始"); sapRson = this.reportHzToSap(sHzWorks); 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 acacc7ff2..3e00b613b 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 @@ -473,7 +473,8 @@ 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/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 421cf69f7..5d1e0c9ce 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -168,6 +168,7 @@ public class QcCheckTaskIncome extends BaseEntity { */ private String delFlag; private String orderType; + private String orderTypeDesc; private String incomeTimeStart; private String incomeTimeEnd; private String checkTimeStart; @@ -195,6 +196,15 @@ public class QcCheckTaskIncome extends BaseEntity { private String materialType;//来料类别 private String materialFrom;//物料来源 + + public String getOrderTypeDesc() { + return orderTypeDesc; + } + + public void setOrderTypeDesc(String orderTypeDesc) { + this.orderTypeDesc = orderTypeDesc; + } + public String getMaterialType() { return materialType; } 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 6487e0286..4ef7ca3ff 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 @@ -256,7 +256,7 @@ public class QcCheckTaskIncomeServiceImpl implements } } qcCheckTaskIncome.setNoOkQuality(noOkQuality); - /**qc_check_task**/ + /**qc_check_task**///------------------zxl qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome); /**qc_check_task_detail**/ 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 dff8c47cf..2cf55975f 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 @@ -36,13 +36,17 @@ + + + select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, - create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality + create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality, + order_type,order_type_desc from qc_check_task @@ -52,7 +56,7 @@ qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status, qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality, - qct.sample_quality, qct.type_code + qct.sample_quality, qct.type_code, qct.order_type from qc_check_task qct and qct.check_no = #{checkNo} @@ -83,6 +87,7 @@ and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120) and qct.check_type = #{checkType} and qct.type_code = #{typeCode} + and qct.order_type = #{orderType} order by qct.create_time DESC @@ -208,6 +213,7 @@ type_code, sample_quality, order_type, + order_type_desc, #{recordId}, @@ -243,6 +249,7 @@ #{typeCode}, #{sampleQuality}, #{orderType}, + #{orderTypeDesc}, diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index f08d93e35..b72170cab 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -415,7 +415,7 @@ public class SapItemSyncImpl implements SapItemSyncService { /**8010 榄菊成品；8020 榄菊半成品；8030 榄菊原材料；8040 榄菊包装材料；8050 榄菊塑料五金电子；8060 榄菊辅助用品 ；8061 榄菊办公用品；8062 榄菊劳保用品；8070 榄菊广宣品；8090 榄菊未估价的物料**/ qcCheckTaskIncomeDTO.setOrderType(maraTable.getString("MTART"));//物料类型 - qcCheckTaskIncomeDTO.setAttr4(maraTable.getString("MTBEZ"));//物料类型描述 + qcCheckTaskIncomeDTO.setOrderTypeDesc(maraTable.getString("MTBEZ"));//物料类型描述 qcCheckTaskIncomeDTO.setOrderNo(maraTable.getString("EBELN"));//采购订单 qcCheckTaskIncomeDTO.setSupplierCode(maraTable.getString("LIFNR")); qcCheckTaskIncomeDTO.setSupplierName(maraTable.getString("LIFNR_NM"));