零件计划统计表和钣金计划统计表后台代码提交

dy

2025-04-23 1c15dbfcab5dd355f00e35a963adffe8ca135b4f

零件计划统计表和钣金计划统计表后台代码提交

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java

@@ -38,15 +38,15 @@

    /** 生产数量 */
    @Excel(name = "生产数量")
    private Long productionQuantity;
    private BigDecimal productionQuantity;

    /** 标准工时 */
    @Excel(name = "标准工时")
    private Long standardTime;
    private BigDecimal standardTime;

    /** 工序总工时 */
    @Excel(name = "工序总工时")
    private Long processTotalTime;
    private BigDecimal processTotalTime;

    /** 计划开工日 */
    @Excel(name = "计划开工日")
@@ -103,32 +103,32 @@
        return currentProcessNumber;
    }

    public void setProductionQuantity(Long productionQuantity) 
    public void setProductionQuantity(BigDecimal productionQuantity)
    {
        this.productionQuantity = productionQuantity;
    }

    public Long getProductionQuantity() 
    public BigDecimal getProductionQuantity()
    {
        return productionQuantity;
    }

    public void setStandardTime(Long standardTime) 
    public void setStandardTime(BigDecimal standardTime)
    {
        this.standardTime = standardTime;
    }

    public Long getStandardTime() 
    public BigDecimal getStandardTime()
    {
        return standardTime;
    }

    public void setProcessTotalTime(Long processTotalTime) 
    public void setProcessTotalTime(BigDecimal processTotalTime)
    {
        this.processTotalTime = processTotalTime;
    }

    public Long getProcessTotalTime() 
    public BigDecimal getProcessTotalTime()
    {
        return processTotalTime;
    }

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java

@@ -41,15 +41,15 @@

    /** 生产数量 */
    @Excel(name = "生产数量")
    private Integer productionQuantity;
    private BigDecimal productionQuantity;

    /** 标准工时 */
    @Excel(name = "标准工时")
    private Integer standardTime;
    private BigDecimal standardTime;

    /** 工序总工时 */
    @Excel(name = "工序总工时")
    private Integer processTotalTime;
    private BigDecimal processTotalTime;

    /** 计划完成日 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -147,32 +147,32 @@
        return currentProcessNumber;
    }

    public void setProductionQuantity(Integer productionQuantity) 
    public void setProductionQuantity(BigDecimal productionQuantity)
    {
        this.productionQuantity = productionQuantity;
    }

    public Integer getProductionQuantity() 
    public BigDecimal getProductionQuantity()
    {
        return productionQuantity;
    }

    public void setStandardTime(Integer standardTime) 
    public void setStandardTime(BigDecimal standardTime)
    {
        this.standardTime = standardTime;
    }

    public Integer getStandardTime() 
    public BigDecimal getStandardTime()
    {
        return standardTime;
    }

    public void setProcessTotalTime(Integer processTotalTime) 
    public void setProcessTotalTime(BigDecimal processTotalTime)
    {
        this.processTotalTime = processTotalTime;
    }

    public Integer getProcessTotalTime() 
    public BigDecimal getProcessTotalTime()
    {
        return processTotalTime;
    }

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java

@@ -167,7 +167,7 @@
                if (stat.getCurrentProcessNumber().compareTo(stat.getRoadProcessNumber()) < 0) {
                    if (last != null) {
                        LocalDateTime lastStartDate = LocalDateTime.ofInstant(last.getProcessPlanStartDay().toInstant(), ZoneId.systemDefault());
                        lastStartDate.plusHours(last.getProcessTotalTime());
                        lastStartDate.plusHours(last.getProcessTotalTime().longValue());
                        stat.setProcessPlanStartDay(Date.from(lastStartDate.atZone(ZoneId.systemDefault()).toInstant()));
                    }
                }

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java

@@ -137,7 +137,7 @@
                        /*计划完工日=钣金计划工单完成时间*/
                        stat.setProcessPlanEndDay(transDate(orderPlanEndDayLocalDateTime));
                        /*计划开工日=钣金计划工单完成时间 -  工序总工时*/
                        LocalDateTime lastPlanStartDt = orderPlanEndDayLocalDateTime.minusHours(stat.getProcessTotalTime());
                        LocalDateTime lastPlanStartDt = orderPlanEndDayLocalDateTime.minusHours(stat.getProcessTotalTime().longValue());
                        if(lastPlanStartDt.isBefore(now)){
                            hasBefore = true;
                            stat.setProcessPlanStartDay(transDate(now));
@@ -161,7 +161,7 @@
                            /*当前工序结束时间=下一道工序的开始时间*/
                            stat.setProcessPlanEndDay(last.getProcessPlanStartDay());
                            /*开始时间=结束时间-总工时*/
                            LocalDateTime crtStartDt = transLocalDateTime(last.getProcessPlanStartDay()).minusHours(stat.getProcessTotalTime());
                            LocalDateTime crtStartDt = transLocalDateTime(last.getProcessPlanStartDay()).minusHours(stat.getProcessTotalTime().longValue());
                            /*如果开始时间小于当前时间*/
                            if(crtStartDt.isBefore(now)){
                                hasBefore=true;