From f5ec605bdab7ade01d58f4c162d34d2a521d6ed2 Mon Sep 17 00:00:00 2001
From: 杨凯 <398860375@qq.com>
Date: 星期六, 21 十月 2023 11:15:14 +0800
Subject: [PATCH] 新增mapper

---
 consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java |   20 ++++
 consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackModel_mapper.java     |   26 +++++
 consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackGoods_mapper.java     |   36 ++++++++
 consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedGoods_mapper.java |   88 ++++-----------------
 consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java      |   32 +++++++
 5 files changed, 123 insertions(+), 79 deletions(-)

diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackGoods_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackGoods_mapper.java
index 9d801f0..4346750 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackGoods_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackGoods_mapper.java
@@ -34,6 +34,8 @@
     public static final String InitCount = "init_count";
     public static final String DepFormLendingGoodsId = "dep_form_lending_goods_id";
     public static final String EndCount = "end_count";
+    public static final String DepFormLendingId = "dep_form_lending_id";
+    public static final String WarehouseId = "warehouse_id";
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -64,6 +66,12 @@
         }
         if (depFormBackGoods.isset_endCount) {
             this.setEndCount(depFormBackGoods.getEndCount());
+        }
+        if (depFormBackGoods.isset_depFormLendingId) {
+            this.setDepFormLendingId(depFormBackGoods.getDepFormLendingId());
+        }
+        if (depFormBackGoods.isset_warehouseId) {
+            this.setWarehouseId(depFormBackGoods.getWarehouseId());
         }
         // 鍘绘帀锛�2022-09-07
         // this.setDatabaseName_(dep_form_back_goods.getDatabaseName_());
@@ -114,6 +122,8 @@
         ib.set(InitCount, this.getInitCount(), this.isset_initCount);
         ib.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ib.set(EndCount, this.getEndCount(), this.isset_endCount);
+        ib.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ib.genMapSql();
     }
 
@@ -129,6 +139,8 @@
         ub.set(InitCount, this.getInitCount(), this.isset_initCount);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(EndCount, this.getEndCount(), this.isset_endCount);
+        ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         ub.where(this.getPkName_(), this.getPkValue_());
         return ub.genMapSql();
     }
@@ -145,6 +157,8 @@
         ub.set(InitCount, this.getInitCount(), this.isset_initCount);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(EndCount, this.getEndCount(), this.isset_endCount);
+        ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ub.genMapSql(where, parameters);
     }
 
@@ -160,6 +174,8 @@
         ub.set(InitCount, this.getInitCount(), this.isset_initCount);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(EndCount, this.getEndCount(), this.isset_endCount);
+        ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ub.genArraySql(where, parameters);
     }
 
@@ -207,7 +223,7 @@
      */
     @Override
     public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
-        return new SqlAndParameters<>("select id, dep_form_back_id, unit, back_counts, init_count, dep_form_lending_goods_id, end_count from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, dep_form_back_id, unit, back_counts, init_count, dep_form_lending_goods_id, end_count, dep_form_lending_id, warehouse_id from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -215,7 +231,7 @@
      */
     @Override
     public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
-        return new SqlAndParameters<>("select id, dep_form_back_id, unit, back_counts, init_count, dep_form_lending_goods_id, end_count from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, dep_form_back_id, unit, back_counts, init_count, dep_form_lending_goods_id, end_count, dep_form_lending_id, warehouse_id from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -296,6 +312,22 @@
                 dep_form_back_goods.setEndCount(rs.getInt(columnIndex));
             }
         }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormBackGoods_mapper.DepFormLendingId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_back_goods.setDepFormLendingId(null);
+            } else {
+                dep_form_back_goods.setDepFormLendingId(rs.getLong(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormBackGoods_mapper.WarehouseId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_back_goods.setWarehouseId(null);
+            } else {
+                dep_form_back_goods.setWarehouseId(rs.getLong(columnIndex));
+            }
+        }
         return dep_form_back_goods;
     }
 }
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackModel_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackModel_mapper.java
index c82d963..93bcf49 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackModel_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormBackModel_mapper.java
@@ -37,6 +37,7 @@
     public static final String DepFormLendingModelId = "dep_form_lending_model_id";
     public static final String DepFormLendingGoodsId = "dep_form_lending_goods_id";
     public static final String DepFormLendingId = "dep_form_lending_id";
+    public static final String WarehouseId = "warehouse_id";
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -76,6 +77,9 @@
         }
         if (depFormBackModel.isset_depFormLendingId) {
             this.setDepFormLendingId(depFormBackModel.getDepFormLendingId());
+        }
+        if (depFormBackModel.isset_warehouseId) {
+            this.setWarehouseId(depFormBackModel.getWarehouseId());
         }
         // 鍘绘帀锛�2022-09-07
         // this.setDatabaseName_(dep_form_back_model.getDatabaseName_());
@@ -129,6 +133,7 @@
         ib.set(DepFormLendingModelId, this.getDepFormLendingModelId(), this.isset_depFormLendingModelId);
         ib.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ib.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ib.genMapSql();
     }
 
@@ -147,6 +152,7 @@
         ub.set(DepFormLendingModelId, this.getDepFormLendingModelId(), this.isset_depFormLendingModelId);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         ub.where(this.getPkName_(), this.getPkValue_());
         return ub.genMapSql();
     }
@@ -166,6 +172,7 @@
         ub.set(DepFormLendingModelId, this.getDepFormLendingModelId(), this.isset_depFormLendingModelId);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ub.genMapSql(where, parameters);
     }
 
@@ -184,6 +191,7 @@
         ub.set(DepFormLendingModelId, this.getDepFormLendingModelId(), this.isset_depFormLendingModelId);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ub.genArraySql(where, parameters);
     }
 
@@ -231,7 +239,7 @@
      */
     @Override
     public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
-        return new SqlAndParameters<>("select id, dep_form_back_goods_id, dep_form_back_id, wh_goods_details_id, using_goods_his_id, wh_goods_id, counts, dep_form_lending_model_id, dep_form_lending_goods_id, dep_form_lending_id from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, dep_form_back_goods_id, dep_form_back_id, wh_goods_details_id, using_goods_his_id, wh_goods_id, counts, dep_form_lending_model_id, dep_form_lending_goods_id, dep_form_lending_id, warehouse_id from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -239,7 +247,7 @@
      */
     @Override
     public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
-        return new SqlAndParameters<>("select id, dep_form_back_goods_id, dep_form_back_id, wh_goods_details_id, using_goods_his_id, wh_goods_id, counts, dep_form_lending_model_id, dep_form_lending_goods_id, dep_form_lending_id from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, dep_form_back_goods_id, dep_form_back_id, wh_goods_details_id, using_goods_his_id, wh_goods_id, counts, dep_form_lending_model_id, dep_form_lending_goods_id, dep_form_lending_id, warehouse_id from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -302,7 +310,11 @@
         }
         columnIndex = resultSetUtils.findColumn(rs, DepFormBackModel_mapper.UsingGoodsHisId);
         if (columnIndex > 0) {
-            dep_form_back_model.setUsingGoodsHisId(rs.getString(columnIndex));
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_back_model.setUsingGoodsHisId(null);
+            } else {
+                dep_form_back_model.setUsingGoodsHisId(rs.getLong(columnIndex));
+            }
         }
         columnIndex = resultSetUtils.findColumn(rs, DepFormBackModel_mapper.WhGoodsId);
         if (columnIndex > 0) {
@@ -344,6 +356,14 @@
                 dep_form_back_model.setDepFormLendingId(rs.getLong(columnIndex));
             }
         }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormBackModel_mapper.WarehouseId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_back_model.setWarehouseId(null);
+            } else {
+                dep_form_back_model.setWarehouseId(rs.getLong(columnIndex));
+            }
+        }
         return dep_form_back_model;
     }
 }
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedGoods_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedGoods_mapper.java
index 8f37775..20cfde6 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedGoods_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedGoods_mapper.java
@@ -28,11 +28,6 @@
     // 涓婚敭
     public static final String Id = "id";
     // 鏅�氬睘鎬�
-    public static final String BaseGoodsTemplateId = "base_goods_template_id";
-    public static final String GoodsTemplateName = "goods_template_name";
-    public static final String Unit = "unit";
-    public static final String BaseGoodsModelsId = "base_goods_models_id";
-    public static final String BaseGoodsModelsName = "base_goods_models_name";
     public static final String ScrappedCounts = "scrapped_counts";
     public static final String InitCount = "init_count";
     public static final String DepFormScrappedId = "dep_form_scrapped_id";
@@ -41,6 +36,7 @@
     public static final String ScrappedName = "scrapped_name";
     public static final String DepFormLendingGoodsId = "dep_form_lending_goods_id";
     public static final String DepFormLendingId = "dep_form_lending_id";
+    public static final String WarehouseId = "warehouse_id";
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -54,21 +50,6 @@
             this.setId(depFormScrappedGoods.getId());
         }
         //鏅�氬睘鎬�
-        if (depFormScrappedGoods.isset_baseGoodsTemplateId) {
-            this.setBaseGoodsTemplateId(depFormScrappedGoods.getBaseGoodsTemplateId());
-        }
-        if (depFormScrappedGoods.isset_goodsTemplateName) {
-            this.setGoodsTemplateName(depFormScrappedGoods.getGoodsTemplateName());
-        }
-        if (depFormScrappedGoods.isset_unit) {
-            this.setUnit(depFormScrappedGoods.getUnit());
-        }
-        if (depFormScrappedGoods.isset_baseGoodsModelsId) {
-            this.setBaseGoodsModelsId(depFormScrappedGoods.getBaseGoodsModelsId());
-        }
-        if (depFormScrappedGoods.isset_baseGoodsModelsName) {
-            this.setBaseGoodsModelsName(depFormScrappedGoods.getBaseGoodsModelsName());
-        }
         if (depFormScrappedGoods.isset_scrappedCounts) {
             this.setScrappedCounts(depFormScrappedGoods.getScrappedCounts());
         }
@@ -92,6 +73,9 @@
         }
         if (depFormScrappedGoods.isset_depFormLendingId) {
             this.setDepFormLendingId(depFormScrappedGoods.getDepFormLendingId());
+        }
+        if (depFormScrappedGoods.isset_warehouseId) {
+            this.setWarehouseId(depFormScrappedGoods.getWarehouseId());
         }
         // 鍘绘帀锛�2022-09-07
         // this.setDatabaseName_(dep_form_scrapped_goods.getDatabaseName_());
@@ -136,11 +120,6 @@
     public SqlAndParameters<Map<String, Object>> getInsertSql_() {
         InsertBuilder ib = new InsertBuilder(this.getTableName_());
         ib.set(Id, this.getId());
-        ib.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
-        ib.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName);
-        ib.set(Unit, this.getUnit(), this.isset_unit);
-        ib.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
-        ib.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName);
         ib.set(ScrappedCounts, this.getScrappedCounts(), this.isset_scrappedCounts);
         ib.set(InitCount, this.getInitCount(), this.isset_initCount);
         ib.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
@@ -149,6 +128,7 @@
         ib.set(ScrappedName, this.getScrappedName(), this.isset_scrappedName);
         ib.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ib.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ib.genMapSql();
     }
 
@@ -158,11 +138,6 @@
     @Override
     public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
-        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
-        ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName);
-        ub.set(Unit, this.getUnit(), this.isset_unit);
-        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
-        ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName);
         ub.set(ScrappedCounts, this.getScrappedCounts(), this.isset_scrappedCounts);
         ub.set(InitCount, this.getInitCount(), this.isset_initCount);
         ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
@@ -171,6 +146,7 @@
         ub.set(ScrappedName, this.getScrappedName(), this.isset_scrappedName);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         ub.where(this.getPkName_(), this.getPkValue_());
         return ub.genMapSql();
     }
@@ -181,11 +157,6 @@
     @Override
     public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
-        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
-        ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName);
-        ub.set(Unit, this.getUnit(), this.isset_unit);
-        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
-        ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName);
         ub.set(ScrappedCounts, this.getScrappedCounts(), this.isset_scrappedCounts);
         ub.set(InitCount, this.getInitCount(), this.isset_initCount);
         ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
@@ -194,6 +165,7 @@
         ub.set(ScrappedName, this.getScrappedName(), this.isset_scrappedName);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ub.genMapSql(where, parameters);
     }
 
@@ -203,11 +175,6 @@
     @Override
     public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
-        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
-        ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName);
-        ub.set(Unit, this.getUnit(), this.isset_unit);
-        ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId);
-        ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName);
         ub.set(ScrappedCounts, this.getScrappedCounts(), this.isset_scrappedCounts);
         ub.set(InitCount, this.getInitCount(), this.isset_initCount);
         ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
@@ -216,6 +183,7 @@
         ub.set(ScrappedName, this.getScrappedName(), this.isset_scrappedName);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ub.genArraySql(where, parameters);
     }
 
@@ -263,7 +231,7 @@
      */
     @Override
     public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
-        return new SqlAndParameters<>("select id, base_goods_template_id, goods_template_name, unit, base_goods_models_id, base_goods_models_name, scrapped_counts, init_count, dep_form_scrapped_id, beiz, scrapped_code, scrapped_name, dep_form_lending_goods_id, dep_form_lending_id from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, scrapped_counts, init_count, dep_form_scrapped_id, beiz, scrapped_code, scrapped_name, dep_form_lending_goods_id, dep_form_lending_id, warehouse_id from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -271,7 +239,7 @@
      */
     @Override
     public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
-        return new SqlAndParameters<>("select id, base_goods_template_id, goods_template_name, unit, base_goods_models_id, base_goods_models_name, scrapped_counts, init_count, dep_form_scrapped_id, beiz, scrapped_code, scrapped_name, dep_form_lending_goods_id, dep_form_lending_id from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, scrapped_counts, init_count, dep_form_scrapped_id, beiz, scrapped_code, scrapped_name, dep_form_lending_goods_id, dep_form_lending_id, warehouse_id from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -308,34 +276,6 @@
             dep_form_scrapped_goods.setId(rs.getLong(columnIndex));
         }
         //鏅�氬睘鎬�
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedGoods_mapper.BaseGoodsTemplateId);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_goods.setBaseGoodsTemplateId(null);
-            } else {
-                dep_form_scrapped_goods.setBaseGoodsTemplateId(rs.getLong(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedGoods_mapper.GoodsTemplateName);
-        if (columnIndex > 0) {
-            dep_form_scrapped_goods.setGoodsTemplateName(rs.getString(columnIndex));
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedGoods_mapper.Unit);
-        if (columnIndex > 0) {
-            dep_form_scrapped_goods.setUnit(rs.getString(columnIndex));
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedGoods_mapper.BaseGoodsModelsId);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_goods.setBaseGoodsModelsId(null);
-            } else {
-                dep_form_scrapped_goods.setBaseGoodsModelsId(rs.getLong(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedGoods_mapper.BaseGoodsModelsName);
-        if (columnIndex > 0) {
-            dep_form_scrapped_goods.setBaseGoodsModelsName(rs.getString(columnIndex));
-        }
         columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedGoods_mapper.ScrappedCounts);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
@@ -388,6 +328,14 @@
                 dep_form_scrapped_goods.setDepFormLendingId(rs.getLong(columnIndex));
             }
         }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedGoods_mapper.WarehouseId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_goods.setWarehouseId(null);
+            } else {
+                dep_form_scrapped_goods.setWarehouseId(rs.getLong(columnIndex));
+            }
+        }
         return dep_form_scrapped_goods;
     }
 }
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java
index 8cb5d40..c5cc65f 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java
@@ -40,6 +40,7 @@
     public static final String DepFormLendingModelId = "dep_form_lending_model_id";
     public static final String DepFormLendingGoodsId = "dep_form_lending_goods_id";
     public static final String DepFormLendingId = "dep_form_lending_id";
+    public static final String WarehouseId = "warehouse_id";
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -88,6 +89,9 @@
         }
         if (depFormScrappedModel.isset_depFormLendingId) {
             this.setDepFormLendingId(depFormScrappedModel.getDepFormLendingId());
+        }
+        if (depFormScrappedModel.isset_warehouseId) {
+            this.setWarehouseId(depFormScrappedModel.getWarehouseId());
         }
         // 鍘绘帀锛�2022-09-07
         // this.setDatabaseName_(dep_form_scrapped_model.getDatabaseName_());
@@ -144,6 +148,7 @@
         ib.set(DepFormLendingModelId, this.getDepFormLendingModelId(), this.isset_depFormLendingModelId);
         ib.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ib.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ib.genMapSql();
     }
 
@@ -165,6 +170,7 @@
         ub.set(DepFormLendingModelId, this.getDepFormLendingModelId(), this.isset_depFormLendingModelId);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         ub.where(this.getPkName_(), this.getPkValue_());
         return ub.genMapSql();
     }
@@ -187,6 +193,7 @@
         ub.set(DepFormLendingModelId, this.getDepFormLendingModelId(), this.isset_depFormLendingModelId);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ub.genMapSql(where, parameters);
     }
 
@@ -208,6 +215,7 @@
         ub.set(DepFormLendingModelId, this.getDepFormLendingModelId(), this.isset_depFormLendingModelId);
         ub.set(DepFormLendingGoodsId, this.getDepFormLendingGoodsId(), this.isset_depFormLendingGoodsId);
         ub.set(DepFormLendingId, this.getDepFormLendingId(), this.isset_depFormLendingId);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         return ub.genArraySql(where, parameters);
     }
 
@@ -255,7 +263,7 @@
      */
     @Override
     public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
-        return new SqlAndParameters<>("select id, dep_form_scrapped_goods_id, scrapped_code, scrapped_name, beiz, using_goods_his_id, dep_form_scrapped_id, wh_goods_id, scrapped_counts, init_count, dep_form_lending_model_id, dep_form_lending_goods_id, dep_form_lending_id from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, dep_form_scrapped_goods_id, scrapped_code, scrapped_name, beiz, using_goods_his_id, dep_form_scrapped_id, wh_goods_id, scrapped_counts, init_count, dep_form_lending_model_id, dep_form_lending_goods_id, dep_form_lending_id, warehouse_id from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -263,7 +271,7 @@
      */
     @Override
     public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
-        return new SqlAndParameters<>("select id, dep_form_scrapped_goods_id, scrapped_code, scrapped_name, beiz, using_goods_his_id, dep_form_scrapped_id, wh_goods_id, scrapped_counts, init_count, dep_form_lending_model_id, dep_form_lending_goods_id, dep_form_lending_id from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, dep_form_scrapped_goods_id, scrapped_code, scrapped_name, beiz, using_goods_his_id, dep_form_scrapped_id, wh_goods_id, scrapped_counts, init_count, dep_form_lending_model_id, dep_form_lending_goods_id, dep_form_lending_id, warehouse_id from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -384,6 +392,14 @@
                 dep_form_scrapped_model.setDepFormLendingId(rs.getLong(columnIndex));
             }
         }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.WarehouseId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_model.setWarehouseId(null);
+            } else {
+                dep_form_scrapped_model.setWarehouseId(rs.getLong(columnIndex));
+            }
+        }
         return dep_form_scrapped_model;
     }
 }
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java
index 261295e..dc42b7b 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrapped_mapper.java
@@ -43,6 +43,8 @@
     public static final String Beiz = "beiz";
     public static final String Beiz2 = "beiz2";
     public static final String UploadFiles = "upload_files";
+    public static final String WarehouseId = "warehouse_id";
+    public static final String WarehouseName = "warehouse_name";
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -100,6 +102,12 @@
         }
         if (depFormScrapped.isset_uploadFiles) {
             this.setUploadFiles(depFormScrapped.getUploadFiles());
+        }
+        if (depFormScrapped.isset_warehouseId) {
+            this.setWarehouseId(depFormScrapped.getWarehouseId());
+        }
+        if (depFormScrapped.isset_warehouseName) {
+            this.setWarehouseName(depFormScrapped.getWarehouseName());
         }
         // 鍘绘帀锛�2022-09-07
         // this.setDatabaseName_(dep_form_scrapped.getDatabaseName_());
@@ -159,6 +167,8 @@
         ib.set(Beiz, this.getBeiz(), this.isset_beiz);
         ib.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
         ib.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles);
+        ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
+        ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
         return ib.genMapSql();
     }
 
@@ -183,6 +193,8 @@
         ub.set(Beiz, this.getBeiz(), this.isset_beiz);
         ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
         ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
+        ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
         ub.where(this.getPkName_(), this.getPkValue_());
         return ub.genMapSql();
     }
@@ -208,6 +220,8 @@
         ub.set(Beiz, this.getBeiz(), this.isset_beiz);
         ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
         ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
+        ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
         return ub.genMapSql(where, parameters);
     }
 
@@ -232,6 +246,8 @@
         ub.set(Beiz, this.getBeiz(), this.isset_beiz);
         ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
         ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles);
+        ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
+        ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
         return ub.genArraySql(where, parameters);
     }
 
@@ -279,7 +295,7 @@
      */
     @Override
     public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
-        return new SqlAndParameters<>("select id, business_form_code, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, reviewer_id, reviewer_name, review_date, review_states, beiz, beiz2, upload_files from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, business_form_code, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, reviewer_id, reviewer_name, review_date, review_states, beiz, beiz2, upload_files, warehouse_id, warehouse_name from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -287,7 +303,7 @@
      */
     @Override
     public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
-        return new SqlAndParameters<>("select id, business_form_code, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, reviewer_id, reviewer_name, review_date, review_states, beiz, beiz2, upload_files from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, business_form_code, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, reviewer_id, reviewer_name, review_date, review_states, beiz, beiz2, upload_files, warehouse_id, warehouse_name from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -412,6 +428,18 @@
         if (columnIndex > 0) {
             dep_form_scrapped.setUploadFiles(rs.getString(columnIndex));
         }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrapped_mapper.WarehouseId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped.setWarehouseId(null);
+            } else {
+                dep_form_scrapped.setWarehouseId(rs.getLong(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrapped_mapper.WarehouseName);
+        if (columnIndex > 0) {
+            dep_form_scrapped.setWarehouseName(rs.getString(columnIndex));
+        }
         return dep_form_scrapped;
     }
 }

--
Gitblit v1.9.1