feat(production): 添加产品主记录审核功能

liyong

2026-05-20 b0bbbf71d1e6ecdbe4abbcc39127f5aac6502f1e

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

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

@@ -14,6 +16,7 @@
@TableName("product_process")
@Data
@ExcelIgnoreUnannotated
@ApiModel(value = "productProcess", description = "工序表")
public class ProductProcess implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -22,10 +25,10 @@
    private Long id;

    /**
     * 工序名称
     * 设备台账id
     */
    @Excel(name = "工序名称")
    private String name;
//    @Excel(name = "设备台账id")
    private Long deviceLeaderId;

    /**
     * 工序编号
@@ -34,17 +37,39 @@
    private String no;

    /**
     * 工序名称
     */
    @Excel(name = "工序名称")
    private String name;

    @ApiModelProperty(value ="工序机台")
    @TableField(value = "device_name")
    @Excel(name = "工序机台")
    private String deviceName;



    /**
     * 备注
     */
    @Excel(name = "备注")
    private String remark;

    @ApiModelProperty(value ="报工人ids")
    @TableField(value = "user_ids")
    @Excel(name = "报工人ids")
    private String userIds;

    /**
     * 工资定额
     */
    @Excel(name = "工资定额")
    @Excel(name = "工资定额"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                )
//    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal salaryQuota;

    @ApiModelProperty("类型 区分是计时还是计件 0 计时 1计件")
//    @Excel(name = "类型 0 计时 1计件")
    private Long type;

    /**
     * 创建时间
@@ -68,5 +93,20 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @ApiModelProperty(value ="是否质检")
    @Excel(name = "是否质检")
    private Boolean isQuality;



    @ApiModelProperty(value ="设备id")
    @TableField(value = "device_id")
    private Long deviceId;
    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;

}