From 2323fdbac8d92f1ca08e2f53a1b356df5b64e2d0 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 10 Sep 2021 14:11:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E4=BC=A0=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=B7=A5=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/foreverwin/mesnac/common/dto/SfcDispatchDto.java | 7 +++---- .../production/service/impl/PodTemplateServiceImpl.java | 6 +++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java index d69b8367..8201e4e0 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java @@ -1,6 +1,5 @@ package com.foreverwin.mesnac.common.dto; -import com.baomidou.mybatisplus.annotation.TableField; import com.foreverwin.mesnac.common.model.ExcelColumn; import java.io.Serializable; @@ -104,7 +103,7 @@ public class SfcDispatchDto implements Serializable{ /** * 工时 */ - private Double prodHours; + private BigDecimal prodHours; /** * 总计划开始时间 */ @@ -405,11 +404,11 @@ public class SfcDispatchDto implements Serializable{ this.dispatchQty = dispatchQty; } - public Double getProdHours() { + public BigDecimal getProdHours() { return prodHours; } - public void setProdHours(Double prodHours) { + public void setProdHours(BigDecimal prodHours) { this.prodHours = prodHours; } 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 3429b3dd..fc16845f 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 @@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.constant.IntegrationTypeConstant; +import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.common.enums.DispatchStatusEnum; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.erp.ZprodordconfStruIn; @@ -341,7 +342,10 @@ public class PodTemplateServiceImpl implements PodTemplateService { sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour); //报工 if (enabled){ - sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); + SfcDispatchDto sfcdispatch = new SfcDispatchDto(); + sfcdispatch.setHandle(HandleEnum.SFC_DISPATCH.getHandle(site, dispatchNo)); + sfcdispatch = sfcDispatchCommonService.findSfcDispatchBySfc(sfcdispatch); + sendErp(sfc, stepId, qty, BigDecimal.ZERO, sfcdispatch.getProdHours()); } } catch (Exception e) { ExceptionUtil.throwException(e); From 95baf4db5189bf1faeb1aff027cc828715de9e77 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 10 Sep 2021 14:52:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dispatch/src/main/resources/mapper/SfcDispatchMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index cf87c2a9..6e680c4c 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -778,8 +778,8 @@ SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE, CC.VALUE, SD.TURN_OPERATION, SD.BLANKING_SIZE, WR.WORK_CENTER ) WIP - LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ - LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ + LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND VI.ROUTER_BO = WIP.ROUTER_BO AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ + LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.ROUTER_BO = WIP.ROUTER_BO AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ ) WIP WHERE WIP.IS_COMPLETED = #{isCompleted}