From d773d44507d3b8b553238b9f4ef140f439df0668 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 4 Nov 2024 23:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MesReportWorkConsumeServiceImpl.java | 23 ++++++++++++++----- .../impl/QcStaticTableServiceImpl.java | 8 +++---- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index f69c05e8a..4edda048b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -358,15 +358,25 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer pTabs.setTitle("第"+i+"层工单物料损耗"); mesReportWorkConsume.setParentOrder("0"); List liblist0 = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume); - for(MesReportWorkConsume lib0:liblist0){ - lib0.setQuantitySplitBom(lib0.getQuantity().divide(lib0.getQuantitySplit(),2,BigDecimal.ROUND_HALF_UP)); + BigDecimal actPro = BigDecimal.ZERO; + BigDecimal planPro = BigDecimal.ZERO; + if(!CollectionUtils.isEmpty(liblist0)){ + actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume); + liblist0.get(0).setQuantityFeedback(actPro); + + planPro = liblist0.get(0).getQuantitySplit(); } - if(!CollectionUtils.isEmpty(liblist0)){ - BigDecimal actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume); - liblist0.get(0).setQuantityFeedback(actPro); + for(MesReportWorkConsume lib0:liblist0){ + //bom用量=单位数量/订单理论数量*报工数量 + lib0.setQuantitySplitBom(new BigDecimal(lib0.getErfmg()) + .divide(lib0.getQuantitySplit(),6,BigDecimal.ROUND_HALF_UP) + .multiply(actPro) + ); } + + pTabs.setLibList(liblist0); tabs.add(pTabs); @@ -379,7 +389,8 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer mesReportWorkConsume.setWorkorderCode(sonWorkOrder.getWorkorderCode()); List liblist = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume); for(MesReportWorkConsume lib:liblist){ - lib.setQuantitySplitBom(lib.getQuantity().divide(lib.getQuantitySplit(),2,BigDecimal.ROUND_HALF_UP)); + lib.setQuantitySplitBom(actPro.multiply(new BigDecimal(lib.getErfmg())) + .divide(planPro,6,BigDecimal.ROUND_HALF_UP)); } sTabs.setLibList(liblist); tabs.add(sTabs); 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 84038bf86..42b1db9ac 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 @@ -1276,7 +1276,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { List colNameArray = null; //数据列//cpkType,'-',q.ymdms Map mxMapData = null; - List cpkTypeList = cpkTypeList = qcStaticTableMapper.getCpkTypeList(qcCPKInfo); + List cpkTypeList = qcStaticTableMapper.getCpkTypeList(qcCPKInfo); if("day".equals(qcCPKInfo.getTableType())){//日报 colNameArray = this.getDayOfYear(qcCPKInfo.getYmArrayStart(),qcCPKInfo.getYmArrayEnd()); mxMapData = qcStaticTableMapper.getDLDataDay(qcCPKInfo); @@ -1344,9 +1344,9 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { dmap.put("date"+index,"0"); dmap.put("cpkAvg","0"); - dmap.put("lineName",""); - dmap.put("checkTypeName",""); - dmap.put("ruleName",""); +// dmap.put("lineName",""); +// dmap.put("checkTypeName",""); +// dmap.put("ruleName",""); serisedata.add(0.0); }