From 2f0ade35ec9107f94c153057b207e4f21e9a29b0 Mon Sep 17 00:00:00 2001
From: zhy <luhan1008611>
Date: 星期三, 25 十月 2023 17:31:33 +0800
Subject: [PATCH] Merge branch 'master' of http://116.198.39.83:7111/r/xxjProject/low-consum-manage

---
 consum-model-pojo/src/main/java/com/consum/model/po/BaseWarehouse_mapper.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/BaseWarehouse_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/BaseWarehouse_mapper.java
index 3c1b0ab..a2db173 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/BaseWarehouse_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/BaseWarehouse_mapper.java
@@ -28,6 +28,7 @@
     // 涓婚敭
     public static final String Id = "id";
     // 鏅�氬睘鎬�
+    public static final String WarehouseType = "warehouse_type";
     public static final String WarehouseCode = "warehouse_code";
     public static final String WarehouseName = "warehouse_name";
     public static final String Adress = "adress";
@@ -51,6 +52,9 @@
             this.setId(baseWarehouse.getId());
         }
         //鏅�氬睘鎬�
+        if (baseWarehouse.isset_warehouseType) {
+            this.setWarehouseType(baseWarehouse.getWarehouseType());
+        }
         if (baseWarehouse.isset_warehouseCode) {
             this.setWarehouseCode(baseWarehouse.getWarehouseCode());
         }
@@ -124,6 +128,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(WarehouseCode, this.getWarehouseCode(), this.isset_warehouseCode);
         ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
         ib.set(Adress, this.getAdress(), this.isset_adress);
@@ -143,6 +148,7 @@
     @Override
     public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
         ub.set(WarehouseCode, this.getWarehouseCode(), this.isset_warehouseCode);
         ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
         ub.set(Adress, this.getAdress(), this.isset_adress);
@@ -163,6 +169,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(WarehouseCode, this.getWarehouseCode(), this.isset_warehouseCode);
         ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
         ub.set(Adress, this.getAdress(), this.isset_adress);
@@ -182,6 +189,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(WarehouseCode, this.getWarehouseCode(), this.isset_warehouseCode);
         ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
         ub.set(Adress, this.getAdress(), this.isset_adress);
@@ -239,7 +247,7 @@
      */
     @Override
     public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
-        return new SqlAndParameters<>("select id, warehouse_code, warehouse_name, adress, parent_agency_id, agency_id, agency_name, classification_code, classification_name, is_default, states from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, warehouse_type, warehouse_code, warehouse_name, adress, parent_agency_id, agency_id, agency_name, classification_code, classification_name, is_default, states from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -247,7 +255,7 @@
      */
     @Override
     public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
-        return new SqlAndParameters<>("select id, warehouse_code, warehouse_name, adress, parent_agency_id, agency_id, agency_name, classification_code, classification_name, is_default, states from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, warehouse_type, warehouse_code, warehouse_name, adress, parent_agency_id, agency_id, agency_name, classification_code, classification_name, is_default, states from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -284,6 +292,14 @@
             base_warehouse.setId(rs.getLong(columnIndex));
         }
         //鏅�氬睘鎬�
+        columnIndex = resultSetUtils.findColumn(rs, BaseWarehouse_mapper.WarehouseType);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                base_warehouse.setWarehouseType(null);
+            } else {
+                base_warehouse.setWarehouseType(rs.getInt(columnIndex));
+            }
+        }
         columnIndex = resultSetUtils.findColumn(rs, BaseWarehouse_mapper.WarehouseCode);
         if (columnIndex > 0) {
             base_warehouse.setWarehouseCode(rs.getString(columnIndex));

--
Gitblit v1.9.1