From 1c7ea171cc429564ee6a70dcd4e72c727bf41ea1 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 10 Apr 2024 13:53:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8D=E5=8D=95=E5=A4=A7=E7=9B=92=E6=95=B0?= =?UTF-8?q?=20=20=E5=AD=90=E5=8D=95=E6=95=B0=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/IWCInterfaceServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 a11e4b73..43e7de7c 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 @@ -375,11 +375,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } //查询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); @@ -398,7 +393,13 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } //母工单报工 logger.info("==========================母工单报工开始"); - pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback()); + if(reportRate != null){ + BigDecimal newQuantity = sHzWorks.getQuantityFeedback().divide(reportRate,2, RoundingMode.HALF_UP); + pHzWork.setQuantityFeedback(newQuantity); + }else{ + pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback()); + } + //pHzWork.setSac2("4");//母单报工固定值(上位机插入数据时候默认4) R sapR = this.reportHzToSap(pHzWork); logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR));