Merge remote-tracking branch 'origin/master'

luqingyang

2023-10-31 ddaf74466d92dffb9ba8242a071f151f9a7e0e41

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

@@ -30,6 +30,7 @@
    // 普通属性
    public static final String WarehouseFlowId = "warehouse_flow_id";
    public static final String WhGoodsId = "wh_goods_id";
    public static final String WarehouseType = "warehouse_type";
    public static final String WarehouseId = "warehouse_id";
    public static final String DealTime = "deal_time";

@@ -50,6 +51,9 @@
        }
        if (lGoodsWhRecord.isset_whGoodsId) {
            this.setWhGoodsId(lGoodsWhRecord.getWhGoodsId());
        }
        if (lGoodsWhRecord.isset_warehouseType) {
            this.setWarehouseType(lGoodsWhRecord.getWarehouseType());
        }
        if (lGoodsWhRecord.isset_warehouseId) {
            this.setWarehouseId(lGoodsWhRecord.getWarehouseId());
@@ -102,6 +106,7 @@
        ib.set(Id, this.getId());
        ib.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
        ib.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
        ib.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
        ib.set(DealTime, this.getDealTime(), this.isset_dealTime);
        return ib.genMapSql();
@@ -115,6 +120,7 @@
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
        ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
        ub.where(this.getPkName_(), this.getPkValue_());
@@ -129,6 +135,7 @@
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
        ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
        return ub.genMapSql(where, parameters);
@@ -142,6 +149,7 @@
        UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
        ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
        ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
        return ub.genArraySql(where, parameters);
@@ -191,7 +199,7 @@
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
        return new SqlAndParameters<>("select id, warehouse_flow_id, wh_goods_id, warehouse_id, deal_time from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, warehouse_flow_id, wh_goods_id, warehouse_type, warehouse_id, deal_time from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -199,7 +207,7 @@
     */
    @Override
    public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
        return new SqlAndParameters<>("select id, warehouse_flow_id, wh_goods_id, warehouse_id, deal_time from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>("select id, warehouse_flow_id, wh_goods_id, warehouse_type, warehouse_id, deal_time from " + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -252,6 +260,14 @@
                l_goods_wh_record.setWhGoodsId(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.WarehouseType);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_goods_wh_record.setWarehouseType(null);
            } else {
                l_goods_wh_record.setWarehouseType(rs.getInt(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.WarehouseId);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {