Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

7 天以前 2127d78079f17d23e9f62454b9692e6e0c6457c2

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/main/java/com/ruoyi/common/enums/ProcessType.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.ruoyi.common.enums;

public enum ProcessType implements BaseEnum<Integer>{

    TIMEKEEPING(1, "计时"),
    PIECERATE(2, "计件");

    private final Integer code;
    private final String value;

    ProcessType(Integer code, String value) {
        this.code = code;
        this.value = value;
    }

    @Override
    public Integer getCode() {
        return this.code;
    }

    @Override
    public String getValue() {
        return this.value;
    }
}

 src/main/java/com/ruoyi/production/pojo/ProductProcess.java

@@ -50,6 +50,9 @@
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal salaryQuota;

    @ApiModelProperty("类型 åŒºåˆ†æ˜¯è®¡æ—¶è¿˜æ˜¯è®¡ä»¶ 0 è®¡æ—¶ 1计件")
    private Long type;

    /**
     * åˆ›å»ºæ—¶é—´
     */

 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java

@@ -234,13 +234,17 @@
                }
            }
            productOrderMapper.updateById(productOrder);
            /*添加生产核算*/
            /*添加生产核算        åŒºåˆ†å·¥åºæ˜¯è®¡ä»¶è¿˜æ˜¯è®¡æ—¶*/
            BigDecimal workHours = (productProcess.getType() == 1)
                    ? productProcess.getSalaryQuota().multiply(productQty)
                    : productProcess.getSalaryQuota();

            SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
                    .productMainId(productionProductMain.getId())
                    .schedulingUserId(user.getUserId())
                    .schedulingUserName(user.getNickName())
                    .finishedNum(productQty)
                    .workHours(productProcess.getSalaryQuota())
                    .workHours(workHours)
                    .process(productProcess.getName())
                    .schedulingDate(LocalDate.now())
                    .tenantId(dto.getTenantId())