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 b8ee2c4d7..0c8f1f464 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 @@ -717,6 +717,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { sapRFW.setAnzma(workOrder.getSapCode());//产线编号 sapRFW.setRemark(workOrder.getRemark());//备注 logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求：" + JSONObject.toJSONString(sapRFW)); + //R r= R.ok(); R r = remoteSapService.sapRFWOrder(sapRFW); logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果：" + r.getCode() + "," + r.getData() + "," + r.getMsg()); //上传成功，更改mes_report_work状态 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/IncomeTableExport.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/IncomeTableExport.java index d5dad30e8..8efbdbbcd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/IncomeTableExport.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/IncomeTableExport.java @@ -37,7 +37,7 @@ public class IncomeTableExport extends BaseEntity { private int okNums; @Excel(name = "不合格数量") private int noOkNums; - @Excel(name = "数量比例") + @Excel(name = "数量不良率") private String noOkNumRate; public String getSupplierId() { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java index 7a81db3ca..9766de6f7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -45,6 +45,7 @@ public class QcCheckTaskProduce extends BaseEntity { this.incomeBatchNo = incomeBatchNo; } private String cpkType; + /** * 订单号 */ @@ -63,7 +64,8 @@ public class QcCheckTaskProduce extends BaseEntity { */ @Excel(name = "物料名称") private String materialName; - + @Excel(name = "CPK品类") + private String cpkTypeName; /** * 数量 */ @@ -210,6 +212,14 @@ public class QcCheckTaskProduce extends BaseEntity { private String shiftId; private String bz;//备注 + public String getCpkTypeName() { + return cpkTypeName; + } + + public void setCpkTypeName(String cpkTypeName) { + this.cpkTypeName = cpkTypeName; + } + public String getCpkType() { return cpkType; } 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 5ea97a53f..c1484de14 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 @@ -92,8 +92,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { //批次不良率 if (tabledto.getBatchs() != 0) { BigDecimal noOkBatchRate = new BigDecimal(tabledto.getNoOkBatchs()).multiply(new BigDecimal("100.00")) - .divide(new BigDecimal(tabledto.getBatchs()), BigDecimal.ROUND_CEILING) - .setScale(2, BigDecimal.ROUND_HALF_UP); + .divide(new BigDecimal(tabledto.getBatchs()), 2,BigDecimal.ROUND_HALF_UP); tabledto.setNoOkBatchRate(noOkBatchRate.toString() + "%"); } else { tabledto.setNoOkBatchRate("0.00%"); @@ -109,8 +108,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { //数量不良率 if (tabledto.getNums() != 0) { BigDecimal noOkNumRate = new BigDecimal(tabledto.getNoOkNums()).multiply(new BigDecimal("100.00")) - .divide(new BigDecimal(tabledto.getNums()), BigDecimal.ROUND_CEILING) - .setScale(2, BigDecimal.ROUND_HALF_UP); + .divide(new BigDecimal(tabledto.getNums()), 4, BigDecimal.ROUND_HALF_UP); tabledto.setNoOkNumRate(noOkNumRate.toString() + "%"); } else { tabledto.setNoOkNumRate("0.00%"); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 223d25fb5..2a2783790 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -89,6 +89,9 @@ and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120) and q.type_code = #{typeCode} and qct.check_type = #{checkType} + + and pow.workorder_code_sap like concat('%',#{workorderCodeSap}, '%') + 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 8e8bf55b0..fc6fc6d98 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 @@ -72,10 +72,8 @@ and qct.material_name like concat('%',#{materialName}, '%') - and qct.supplier_code = #{supplierCode} - and qct.supplier_name like concat('%', - #{supplierName}, '%') - + and qct.supplier_code like concat('%',#{supplierCode}, '%') + and qct.supplier_name like concat('%',#{supplierName}, '%') and qct.income_time = #{incomeTime} and qct.check_loc = #{checkLoc} and qct.check_status = #{checkStatus} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 5eb0f6b23..dc75e15a4 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -46,6 +46,7 @@ + @@ -108,12 +109,13 @@ 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.sample_quality,qct.noOk_quality,bpa.cpk_type, + qct.check_type,qct.sample_quality,qct.noOk_quality,bpa.cpk_type,sdd.dict_label cpkTypeName, q.type_code,q.check_name,SUBSTRING(pow.workorder_code_sap, 4, 12) workorderCodeSap from qc_check_task qct left join qc_check_type q on q.id = qct.check_type left join pro_order_workorder pow on pow.workorder_code = qct.order_no left join base_product_attached bpa on concat('0000000',bpa.product_code) = qct.material_code + left join lanju_op_cloud.dbo.sys_dict_data sdd on sdd.dict_type = 'qms_category' and sdd.dict_value = bpa.cpk_type and qct.check_no = #{checkNo} and qct.income_batch_no = #{incomeBatchNo} 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 8c298431e..5299836f9 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 @@ -206,7 +206,9 @@ left join base_equipment be on be.equipment_code = qct.check_loc where qct.check_type = 'checkTypeSCXJ' and qct.del_flag = '0' and pow.del_flag = '0' and qct.check_no like concat('%',#{orderNo},'%') - and qct.material_code like concat('%',#{materialCode},'%') + and ( + qct.material_code like concat('%',#{materialCode},'%') or qct.material_name like concat('%',#{materialCode},'%') + ) and qct.income_batch_no like concat('%',#{incomeBatchNo},'%') and CONVERT(varchar(10),pow.product_date, 120) = #{incomeTimeStr} and CONVERT(varchar(30),qct.income_time, 120) >= #{incomeTimeStart}