diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java b/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java index c10c26d3..29c591cd 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java @@ -4,6 +4,7 @@ import com.foreverwin.mesnac.meapi.dto.SfcDto; import com.foreverwin.mesnac.meapi.dto.WorkCenterDto; import com.foreverwin.mesnac.meapi.model.Sfc; +import java.math.BigDecimal; import java.util.Map; public interface PodTemplateService { @@ -17,6 +18,8 @@ public interface PodTemplateService { void sfcComplete(Map map); + void sendErp(String sfc, String stepId, BigDecimal qty, BigDecimal scrapQty); + SfcDto getInfoBySfc(Sfc sfc); } 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 1fdab6f5..d4698b87 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 @@ -303,7 +303,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { inspectionTaskService.createTask(paramMap); } //报工 - sendErp(sfc, stepId, qty); + sendErp(sfc, stepId, qty,BigDecimal.ZERO); } catch (Exception e) { ExceptionUtil.throwException(e); } @@ -399,8 +399,8 @@ public class PodTemplateServiceImpl implements PodTemplateService { assemblyServiceInterface.assembleByComponents(assembleComponentsRequest); } - - void sendErp(String sfc, String stepId, BigDecimal qty) { + @Override + public void sendErp(String sfc, String stepId, BigDecimal qty ,BigDecimal scrapQty) { Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(CommonMethods.getSite(),sfc)); String shopOrderBo = sfcServiceById.getShopOrderBo(); String shopOrder = StringUtil.trimHandle(shopOrderBo); @@ -416,7 +416,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { //良品数量 struIn.setLmnga(qty); //报废数量 - struIn.setXmnga(BigDecimal.ZERO); + struIn.setXmnga(scrapQty); //机器工时 struIn.setIsm01(BigDecimal.ZERO); //人工工时