From 24d64769178c9b31891164c91e5bc446b3b9dd6b Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期四, 02 十一月 2023 09:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java
index ac3848c..8c24516 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java
@@ -7,6 +7,8 @@
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;
@@ -30,10 +32,14 @@
public static final String BusinessFormCode = "business_form_code";
public static final String InWarehouseFlowId = "in_warehouse_flow_id";
public static final String TransBusinessId = "trans_business_id";
+ public static final String OutWarehouseType = "out_warehouse_type";
public static final String OutputCode = "output_code";
public static final String OutputName = "output_name";
public static final String WarehouseId = "warehouse_id";
public static final String WarehouseName = "warehouse_name";
+ public static final String InWarehouseType = "in_warehouse_type";
+ public static final String InWarehouseId = "in_warehouse_id";
+ public static final String InWarehouseName = "in_warehouse_name";
public static final String AgencyId = "agency_id";
public static final String AgencyName = "agency_name";
public static final String OperatorId = "operator_id";
@@ -66,6 +72,9 @@
if (lWhFormOutput.isset_transBusinessId) {
this.setTransBusinessId(lWhFormOutput.getTransBusinessId());
}
+ if (lWhFormOutput.isset_outWarehouseType) {
+ this.setOutWarehouseType(lWhFormOutput.getOutWarehouseType());
+ }
if (lWhFormOutput.isset_outputCode) {
this.setOutputCode(lWhFormOutput.getOutputCode());
}
@@ -77,6 +86,15 @@
}
if (lWhFormOutput.isset_warehouseName) {
this.setWarehouseName(lWhFormOutput.getWarehouseName());
+ }
+ if (lWhFormOutput.isset_inWarehouseType) {
+ this.setInWarehouseType(lWhFormOutput.getInWarehouseType());
+ }
+ if (lWhFormOutput.isset_inWarehouseId) {
+ this.setInWarehouseId(lWhFormOutput.getInWarehouseId());
+ }
+ if (lWhFormOutput.isset_inWarehouseName) {
+ this.setInWarehouseName(lWhFormOutput.getInWarehouseName());
}
if (lWhFormOutput.isset_agencyId) {
this.setAgencyId(lWhFormOutput.getAgencyId());
@@ -146,10 +164,14 @@
ib.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
ib.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
ib.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ib.set(OutWarehouseType, this.getOutWarehouseType(), this.isset_outWarehouseType);
ib.set(OutputCode, this.getOutputCode(), this.isset_outputCode);
ib.set(OutputName, this.getOutputName(), this.isset_outputName);
ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
+ ib.set(InWarehouseType, this.getInWarehouseType(), this.isset_inWarehouseType);
+ ib.set(InWarehouseId, this.getInWarehouseId(), this.isset_inWarehouseId);
+ ib.set(InWarehouseName, this.getInWarehouseName(), this.isset_inWarehouseName);
ib.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ib.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -170,10 +192,14 @@
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OutWarehouseType, this.getOutWarehouseType(), this.isset_outWarehouseType);
ub.set(OutputCode, this.getOutputCode(), this.isset_outputCode);
ub.set(OutputName, this.getOutputName(), this.isset_outputName);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
+ ub.set(InWarehouseType, this.getInWarehouseType(), this.isset_inWarehouseType);
+ ub.set(InWarehouseId, this.getInWarehouseId(), this.isset_inWarehouseId);
+ ub.set(InWarehouseName, this.getInWarehouseName(), this.isset_inWarehouseName);
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -195,10 +221,14 @@
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OutWarehouseType, this.getOutWarehouseType(), this.isset_outWarehouseType);
ub.set(OutputCode, this.getOutputCode(), this.isset_outputCode);
ub.set(OutputName, this.getOutputName(), this.isset_outputName);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
+ ub.set(InWarehouseType, this.getInWarehouseType(), this.isset_inWarehouseType);
+ ub.set(InWarehouseId, this.getInWarehouseId(), this.isset_inWarehouseId);
+ ub.set(InWarehouseName, this.getInWarehouseName(), this.isset_inWarehouseName);
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -219,10 +249,14 @@
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OutWarehouseType, this.getOutWarehouseType(), this.isset_outWarehouseType);
ub.set(OutputCode, this.getOutputCode(), this.isset_outputCode);
ub.set(OutputName, this.getOutputName(), this.isset_outputName);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
+ ub.set(InWarehouseType, this.getInWarehouseType(), this.isset_inWarehouseType);
+ ub.set(InWarehouseId, this.getInWarehouseId(), this.isset_inWarehouseId);
+ ub.set(InWarehouseName, this.getInWarehouseName(), this.isset_inWarehouseName);
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -277,7 +311,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, warehouse_flow_id, business_form_code, in_warehouse_flow_id, trans_business_id, output_code, output_name, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_flow_id, business_form_code, in_warehouse_flow_id, trans_business_id, out_warehouse_type, output_code, output_name, warehouse_id, warehouse_name, in_warehouse_type, in_warehouse_id, in_warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -285,7 +319,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, warehouse_flow_id, business_form_code, in_warehouse_flow_id, trans_business_id, output_code, output_name, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_flow_id, business_form_code, in_warehouse_flow_id, trans_business_id, out_warehouse_type, output_code, output_name, warehouse_id, warehouse_name, in_warehouse_type, in_warehouse_id, in_warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -350,6 +384,14 @@
l_wh_form_output.setTransBusinessId(rs.getLong(columnIndex));
}
}
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.OutWarehouseType);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setOutWarehouseType(null);
+ } else {
+ l_wh_form_output.setOutWarehouseType(rs.getInt(columnIndex));
+ }
+ }
columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.OutputCode);
if (columnIndex > 0) {
l_wh_form_output.setOutputCode(rs.getString(columnIndex));
@@ -370,6 +412,26 @@
if (columnIndex > 0) {
l_wh_form_output.setWarehouseName(rs.getString(columnIndex));
}
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.InWarehouseType);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setInWarehouseType(null);
+ } else {
+ l_wh_form_output.setInWarehouseType(rs.getInt(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.InWarehouseId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setInWarehouseId(null);
+ } else {
+ l_wh_form_output.setInWarehouseId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.InWarehouseName);
+ if (columnIndex > 0) {
+ l_wh_form_output.setInWarehouseName(rs.getString(columnIndex));
+ }
columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.AgencyId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
--
Gitblit v1.9.1