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/LGoodsWhRecord_mapper.java | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord_mapper.java
index ae734c1..60801e6 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord_mapper.java
@@ -28,10 +28,9 @@
// 涓婚敭
public static final String Id = "id";
// 鏅�氬睘鎬�
- public static final String LWarehouseFlowId = "l_warehouse_flow_id";
- public static final String LWhGoodsId = "l_wh_goods_id";
+ public static final String WarehouseFlowId = "warehouse_flow_id";
+ public static final String WhGoodsId = "wh_goods_id";
public static final String WarehouseId = "warehouse_id";
- public static final String ParentId = "parent_id";
public static final String DealTime = "deal_time";
/**
@@ -46,17 +45,14 @@
this.setId(lGoodsWhRecord.getId());
}
//鏅�氬睘鎬�
- if (lGoodsWhRecord.isset_lWarehouseFlowId) {
- this.setLWarehouseFlowId(lGoodsWhRecord.getLWarehouseFlowId());
+ if (lGoodsWhRecord.isset_warehouseFlowId) {
+ this.setWarehouseFlowId(lGoodsWhRecord.getWarehouseFlowId());
}
- if (lGoodsWhRecord.isset_lWhGoodsId) {
- this.setLWhGoodsId(lGoodsWhRecord.getLWhGoodsId());
+ if (lGoodsWhRecord.isset_whGoodsId) {
+ this.setWhGoodsId(lGoodsWhRecord.getWhGoodsId());
}
if (lGoodsWhRecord.isset_warehouseId) {
this.setWarehouseId(lGoodsWhRecord.getWarehouseId());
- }
- if (lGoodsWhRecord.isset_parentId) {
- this.setParentId(lGoodsWhRecord.getParentId());
}
if (lGoodsWhRecord.isset_dealTime) {
this.setDealTime(lGoodsWhRecord.getDealTime());
@@ -104,10 +100,9 @@
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(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId);
+ ib.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
+ ib.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
- ib.set(ParentId, this.getParentId(), this.isset_parentId);
ib.set(DealTime, this.getDealTime(), this.isset_dealTime);
return ib.genMapSql();
}
@@ -118,10 +113,9 @@
@Override
public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
- ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
- ub.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId);
+ ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
+ ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
- ub.set(ParentId, this.getParentId(), this.isset_parentId);
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
ub.where(this.getPkName_(), this.getPkValue_());
return ub.genMapSql();
@@ -133,10 +127,9 @@
@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(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId);
+ ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
+ ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
- ub.set(ParentId, this.getParentId(), this.isset_parentId);
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
return ub.genMapSql(where, parameters);
}
@@ -147,10 +140,9 @@
@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(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId);
+ ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
+ ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
- ub.set(ParentId, this.getParentId(), this.isset_parentId);
ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
return ub.genArraySql(where, parameters);
}
@@ -199,7 +191,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, l_warehouse_flow_id, l_wh_goods_id, warehouse_id, parent_id, deal_time from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_flow_id, wh_goods_id, warehouse_id, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -207,7 +199,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, l_warehouse_flow_id, l_wh_goods_id, warehouse_id, parent_id, deal_time from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_flow_id, wh_goods_id, warehouse_id, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -244,20 +236,20 @@
l_goods_wh_record.setId(rs.getLong(columnIndex));
}
//鏅�氬睘鎬�
- columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.LWarehouseFlowId);
+ columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.WarehouseFlowId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- l_goods_wh_record.setLWarehouseFlowId(null);
+ l_goods_wh_record.setWarehouseFlowId(null);
} else {
- l_goods_wh_record.setLWarehouseFlowId(rs.getLong(columnIndex));
+ l_goods_wh_record.setWarehouseFlowId(rs.getLong(columnIndex));
}
}
- columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.LWhGoodsId);
+ columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.WhGoodsId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- l_goods_wh_record.setLWhGoodsId(null);
+ l_goods_wh_record.setWhGoodsId(null);
} else {
- l_goods_wh_record.setLWhGoodsId(rs.getLong(columnIndex));
+ l_goods_wh_record.setWhGoodsId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.WarehouseId);
@@ -266,14 +258,6 @@
l_goods_wh_record.setWarehouseId(null);
} else {
l_goods_wh_record.setWarehouseId(rs.getLong(columnIndex));
- }
- }
- columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.ParentId);
- if (columnIndex > 0) {
- if (rs.getBigDecimal(columnIndex) == null) {
- l_goods_wh_record.setParentId(null);
- } else {
- l_goods_wh_record.setParentId(rs.getInt(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.DealTime);
--
Gitblit v1.9.1