From 21b7e5ba0600efb569cdbf41c4f7ba89dbdefe35 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 27 Aug 2021 11:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E3=80=81=E5=8F=91=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/dispatch/service/impl/CallItemServiceImpl.java | 4 ++-- .../production/service/impl/PodTemplateServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java index f1ecba2b..66b09858 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java @@ -478,7 +478,7 @@ public class CallItemServiceImpl extends ServiceImpl i int sizeLength = size.length; BigDecimal length = new BigDecimal(size[sizeLength-1]); BigDecimal width = new BigDecimal(size[sizeLength-2]); - BigDecimal sizeReqQty = length.multiply(width).multiply(reqQty); + BigDecimal sizeReqQty = length.multiply(width).multiply(reqQty).divide(new BigDecimal(1000000)); callItem.setSizeReqQty(sizeReqQty); //按物料汇总需求数量 @@ -495,7 +495,7 @@ public class CallItemServiceImpl extends ServiceImpl i if (size != null && size.length >= 1) { int sizeLength = size.length; BigDecimal length = new BigDecimal(size[sizeLength-1]); - BigDecimal sizeReqQty = length.multiply(reqQty); + BigDecimal sizeReqQty = length.multiply(reqQty).divide(new BigDecimal(1000)); callItem.setSizeReqQty(sizeReqQty); //按物料汇总需求数量 diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index b24ba775..bb6d89a6 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -313,7 +313,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { //更改派工单状态 sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode()); //报工 - //sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); + sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); } catch (Exception e) { ExceptionUtil.throwException(e); }