将code 改成string

huminmin

4 天以前 9cc95195220cc3b3d50224c60223df1eb7e82cf7

将code 改成string

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

@@ -4,22 +4,20 @@


@Getter
public enum StockQualifiedRecordTypeEnum implements BaseEnum<Integer> {
    CUSTOMIZATION_STOCK_IN(0, "合格自定义入库"),
    CUSTOMIZATION_STOCK_OUT(1, "合格自定义出库"),
    PRODUCTION_REPORT_STOCK_IN(2, "生产报工-入库"),
    PRODUCTION_REPORT_STOCK_OUT(3, "生产报工-出库"),
    DEFECTIVE_PASS(6, "不合格处理-让步放行"),
    PURCHASE_STOCK_IN(7, "采购-入库"),
    SALE_STOCK_OUT(8, "销售-出库"),
    QUALITYINSPECT_STOCK_IN(11, "质检-合格入库");
public enum StockQualifiedRecordTypeEnum implements BaseEnum<String> {
    CUSTOMIZATION_STOCK_IN("0", "合格自定义入库"),
    CUSTOMIZATION_STOCK_OUT("1", "合格自定义出库"),
    PRODUCTION_REPORT_STOCK_IN("2", "生产报工-入库"),
    PRODUCTION_REPORT_STOCK_OUT("3", "生产报工-出库"),
    DEFECTIVE_PASS("6", "不合格处理-让步放行"),
    PURCHASE_STOCK_IN("7", "采购-入库"),
    SALE_STOCK_OUT("8", "销售-出库"),
    QUALITYINSPECT_STOCK_IN("11", "质检-合格入库");



    private final Integer code;
    private final String code;
    private final String value;

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

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

@@ -4,20 +4,20 @@


@Getter
public enum StockUnQualifiedRecordTypeEnum implements BaseEnum<Integer> {
public enum StockUnQualifiedRecordTypeEnum implements BaseEnum<String> {


    PRODUCTION_SCRAP(4, "生产报工-报废"),
    DEFECTIVE_SCRAP(5, "不合格处理-报废"),
    CUSTOMIZATION_UNSTOCK_IN(9, "不合格自定义入库"),
    CUSTOMIZATION_UNSTOCK_OUT(10, "不合格自定义出库"),
    QUALITYINSPECT_UNSTOCK_IN(12, "质检-不合格入库");
    PRODUCTION_SCRAP("4", "生产报工-报废"),
    DEFECTIVE_SCRAP("5", "不合格处理-报废"),
    CUSTOMIZATION_UNSTOCK_IN("9", "不合格自定义入库"),
    CUSTOMIZATION_UNSTOCK_OUT("10", "不合格自定义出库"),
    QUALITYINSPECT_UNSTOCK_IN("12", "质检-不合格入库");


    private final Integer code;
    private final String code;
    private final String value;

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

 src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java

@@ -50,7 +50,7 @@
     * @param recordType
     * @param recordId
     */
    public void addUnStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) {
    public void addUnStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) {
        StockUninventoryDto stockUninventoryDto = new StockUninventoryDto();
        stockUninventoryDto.setRecordId(recordId);
        stockUninventoryDto.setRecordType(String.valueOf(recordType));
@@ -82,7 +82,7 @@
     * @param recordType
     * @param recordId
     */
    public void addStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) {
    public void addStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) {
        StockInventoryDto stockInventoryDto = new StockInventoryDto();
        stockInventoryDto.setRecordId(recordId);
        stockInventoryDto.setRecordType(String.valueOf(recordType));
@@ -98,7 +98,7 @@
     * @param recordType
     * @param recordId
     */
    public void substractStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) {
    public void substractStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) {
        StockInventoryDto stockInventoryDto = new StockInventoryDto();
        stockInventoryDto.setRecordId(recordId);
        stockInventoryDto.setRecordType(String.valueOf(recordType));
@@ -108,7 +108,7 @@
    }

    //不合格库存删除
    public void deleteStockRecord(Long recordId, Integer recordType) {
    public void deleteStockRecord(Long recordId, String recordType) {
        StockInRecord one = stockInRecordService.getOne(new QueryWrapper<StockInRecord>()
                .lambda().eq(StockInRecord::getRecordId, recordId)
                .eq(StockInRecord::getRecordType, recordType));