From d2048c247c446be08598abf8e1bc11a4ea77be32 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期三, 25 十月 2023 16:41:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java
index 1a2769a..a115a9f 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java
@@ -7,8 +7,6 @@
import com.walker.jdbc.sqlgen.InsertBuilder;
import com.walker.jdbc.sqlgen.SelectBuilder;
import com.walker.jdbc.sqlgen.UpdateBuilder;
-import com.walker.jdbc.util.StringUtils;
-
import org.springframework.jdbc.core.RowMapper;
import java.sql.ResultSet;
@@ -28,7 +26,7 @@
// 涓婚敭
public static final String Id = "id";
// 鏅�氬睘鎬�
- public static final String LWarehouseFlowId = "l_warehouse_flow_id";
+ public static final String WarehouseId = "warehouse_id";
public static final String WarehouseFlowId = "warehouse_flow_id";
public static final String InitialCount = "initial_count";
public static final String ThisType = "this_type";
@@ -38,6 +36,7 @@
public static final String GoodsTemplateName = "goods_template_name";
public static final String BaseGoodsModelsId = "base_goods_models_id";
public static final String BaseGoodsModelsName = "base_goods_models_name";
+ public static final String DealTime = "deal_time";
/**
* 榛樿鏋勯�犲嚱鏁�
@@ -51,8 +50,8 @@
this.setId(lWhGoodsRecord.getId());
}
//鏅�氬睘鎬�
- if (lWhGoodsRecord.isset_lWarehouseFlowId) {
- this.setLWarehouseFlowId(lWhGoodsRecord.getLWarehouseFlowId());
+ if (lWhGoodsRecord.isset_warehouseId) {
+ this.setWarehouseId(lWhGoodsRecord.getWarehouseId());
}
if (lWhGoodsRecord.isset_warehouseFlowId) {
this.setWarehouseFlowId(lWhGoodsRecord.getWarehouseFlowId());
@@ -80,6 +79,9 @@
}
if (lWhGoodsRecord.isset_baseGoodsModelsName) {
this.setBaseGoodsModelsName(lWhGoodsRecord.getBaseGoodsModelsName());
+ }
+ if (lWhGoodsRecord.isset_dealTime) {
+ this.setDealTime(lWhGoodsRecord.getDealTime());
}
// 鍘绘帀锛�2022-09-07
// this.setDatabaseName_(l_wh_goods_record.getDatabaseName_());
@@ -124,7 +126,7 @@
public SqlAndParameters<Map<String, Object>> getInsertSql_() {
InsertBuilder ib = new InsertBuilder(this.getTableName_());
ib.set(Id, this.getId());
- ib.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
+ ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ib.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
ib.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
ib.set(ThisType, this.getThisType(), this.isset_thisType);
@@ -134,6 +136,7 @@
ib.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName);
ib.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
ib.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName);
+ ib.set(DealTime, this.getDealTime(), this.isset_dealTime);
return ib.genMapSql();
}
@@ -143,7 +146,7 @@
@Override
public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
- ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
ub.set(ThisType, this.getThisType(), this.isset_thisType);
@@ -153,6 +156,7 @@
ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName);
ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
ub.where(this.getPkName_(), this.getPkValue_());
return ub.genMapSql();
}
@@ -163,7 +167,7 @@
@Override
public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
- ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
ub.set(ThisType, this.getThisType(), this.isset_thisType);
@@ -173,6 +177,7 @@
ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName);
ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
return ub.genMapSql(where, parameters);
}
@@ -182,7 +187,7 @@
@Override
public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
- ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
ub.set(ThisType, this.getThisType(), this.isset_thisType);
@@ -192,6 +197,7 @@
ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName);
ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
return ub.genArraySql(where, parameters);
}
@@ -239,7 +245,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, l_warehouse_flow_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -247,7 +253,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, l_warehouse_flow_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -284,12 +290,12 @@
l_wh_goods_record.setId(rs.getLong(columnIndex));
}
//鏅�氬睘鎬�
- columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.LWarehouseFlowId);
+ columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.WarehouseId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- l_wh_goods_record.setLWarehouseFlowId(null);
+ l_wh_goods_record.setWarehouseId(null);
} else {
- l_wh_goods_record.setLWarehouseFlowId(rs.getLong(columnIndex));
+ l_wh_goods_record.setWarehouseId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.WarehouseFlowId);
@@ -356,6 +362,14 @@
if (columnIndex > 0) {
l_wh_goods_record.setBaseGoodsModelsName(rs.getString(columnIndex));
}
+ columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.DealTime);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_goods_record.setDealTime(null);
+ } else {
+ l_wh_goods_record.setDealTime(rs.getLong(columnIndex));
+ }
+ }
return l_wh_goods_record;
}
}
--
Gitblit v1.9.1