From 93dd846b5023cc268b06e0a8e0fb6a04a4ff5fde Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期四, 02 十一月 2023 17:36:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-model-pojo/src/main/java/com/consum/model/po/WhWarning_mapper.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/WhWarning_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/WhWarning_mapper.java
index fbb74df..24aa35e 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/WhWarning_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/WhWarning_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 BaseWarehouseName = "base_warehouse_name";
public static final String BaseGoodsTemplateId = "base_goods_template_id";
@@ -59,6 +60,9 @@
this.setId(whWarning.getId());
}
//鏅�氬睘鎬�
+ if (whWarning.isset_warehouseType) {
+ this.setWarehouseType(whWarning.getWarehouseType());
+ }
if (whWarning.isset_baseWarehouseId) {
this.setBaseWarehouseId(whWarning.getBaseWarehouseId());
}
@@ -156,6 +160,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(BaseWarehouseName, this.getBaseWarehouseName(), this.isset_baseWarehouseName);
ib.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
@@ -183,6 +188,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(BaseWarehouseName, this.getBaseWarehouseName(), this.isset_baseWarehouseName);
ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
@@ -211,6 +217,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(BaseWarehouseName, this.getBaseWarehouseName(), this.isset_baseWarehouseName);
ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
@@ -238,6 +245,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(BaseWarehouseName, this.getBaseWarehouseName(), this.isset_baseWarehouseName);
ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
@@ -303,7 +311,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, base_warehouse_id, base_warehouse_name, base_goods_template_id, base_goods_template_name, base_goods_models_id, base_goods_models_name, goods_type, warning_type, upper_limit, lower_limit, warehouse_count, warning_time, states, operator_id, operator_name, deal_time, agency_id, agency_name from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_type, base_warehouse_id, base_warehouse_name, base_goods_template_id, base_goods_template_name, base_goods_models_id, base_goods_models_name, goods_type, warning_type, upper_limit, lower_limit, warehouse_count, warning_time, states, operator_id, operator_name, deal_time, agency_id, agency_name from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -311,7 +319,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, base_warehouse_id, base_warehouse_name, base_goods_template_id, base_goods_template_name, base_goods_models_id, base_goods_models_name, goods_type, warning_type, upper_limit, lower_limit, warehouse_count, warning_time, states, operator_id, operator_name, deal_time, agency_id, agency_name from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_type, base_warehouse_id, base_warehouse_name, base_goods_template_id, base_goods_template_name, base_goods_models_id, base_goods_models_name, goods_type, warning_type, upper_limit, lower_limit, warehouse_count, warning_time, states, operator_id, operator_name, deal_time, agency_id, agency_name from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -348,6 +356,14 @@
wh_warning.setId(rs.getLong(columnIndex));
}
//鏅�氬睘鎬�
+ columnIndex = resultSetUtils.findColumn(rs, WhWarning_mapper.WarehouseType);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ wh_warning.setWarehouseType(null);
+ } else {
+ wh_warning.setWarehouseType(rs.getInt(columnIndex));
+ }
+ }
columnIndex = resultSetUtils.findColumn(rs, WhWarning_mapper.BaseWarehouseId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
--
Gitblit v1.9.1