Merge remote-tracking branch 'origin/master'

luqingyang

2023-11-02 93dd846b5023cc268b06e0a8e0fb6a04a4ff5fde

 consum-model-pojo/src/main/java/com/consum/model/po/WhWarningConfig_mapper.java

@@ -28,6 +28,7 @@
    // 主键
    public static final String Id = "id";
    // 普通属性
    public static final String WarehouseType = "warehouse_type";
    public static final String BaseWarehouseId = "base_warehouse_id";
    public static final String BaseGoodsTemplateId = "base_goods_template_id";
    public static final String BaseGoodsModelsId = "base_goods_models_id";
@@ -47,6 +48,9 @@
            this.setId(whWarningConfig.getId());
        }
        //普通属性
        if (whWarningConfig.isset_warehouseType) {
            this.setWarehouseType(whWarningConfig.getWarehouseType());
        }
        if (whWarningConfig.isset_baseWarehouseId) {
            this.setBaseWarehouseId(whWarningConfig.getBaseWarehouseId());
        }
@@ -108,6 +112,7 @@
    public SqlAndParameters<Map<String, Object>> getInsertSql_() {
        InsertBuilder ib = new InsertBuilder(this.getTableName_());
        ib.set(Id, this.getId());
        ib.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ib.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ib.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
        ib.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
@@ -123,6 +128,7 @@
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
@@ -139,6 +145,7 @@
    @Override
    public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
@@ -154,6 +161,7 @@
    @Override
    public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(BaseWarehouseId, this.getBaseWarehouseId(), this.isset_baseWarehouseId);
        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
@@ -207,7 +215,7 @@
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
        return new SqlAndParameters<>("select id, base_warehouse_id, base_goods_template_id, base_goods_models_id, goods_type, upper_limit, lower_limit from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, warehouse_type, base_warehouse_id, base_goods_template_id, base_goods_models_id, goods_type, upper_limit, lower_limit from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -215,7 +223,7 @@
     */
    @Override
    public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
        return new SqlAndParameters<>("select id, base_warehouse_id, base_goods_template_id, base_goods_models_id, goods_type, upper_limit, lower_limit from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, warehouse_type, base_warehouse_id, base_goods_template_id, base_goods_models_id, goods_type, upper_limit, lower_limit from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -252,6 +260,14 @@
            wh_warning_config.setId(rs.getLong(columnIndex));
        }
        //普通属性
        columnIndex = resultSetUtils.findColumn(rs, WhWarningConfig_mapper.WarehouseType);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                wh_warning_config.setWarehouseType(null);
            } else {
                wh_warning_config.setWarehouseType(rs.getInt(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, WhWarningConfig_mapper.BaseWarehouseId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {