From 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:38:56 +0800
Subject: [PATCH] feat: 部门退回/报废公用接口

---
 consum-model-pojo/src/main/java/com/consum/model/po/DepFormScrappedModel_mapper.java |  337 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 182 insertions(+), 155 deletions(-)

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 c5cc65f..1927f70 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
@@ -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;
@@ -16,7 +14,8 @@
 import java.util.Map;
 
 /**
- * 琛ㄥ悕:DEP_FORM_SCRAPPED_MODEL *
+ * 琛ㄥ悕:DEP_FORM_SCRAPPED_MODEL
+ *
  * @author genrator
  */
 public class DepFormScrappedModel_mapper extends DepFormScrappedModel implements BaseMapper<DepFormScrappedModel> {
@@ -28,19 +27,22 @@
     // 涓婚敭
     public static final String Id = "id";
     // 鏅�氬睘鎬�
+    public static final String DepFormScrappedId = "dep_form_scrapped_id";
     public static final String DepFormScrappedGoodsId = "dep_form_scrapped_goods_id";
     public static final String ScrappedCode = "scrapped_code";
     public static final String ScrappedName = "scrapped_name";
+    public static final String BaseGoodsTemplateId = "base_goods_template_id";
+    public static final String BaseGoodsTemplateName = "base_goods_template_name";
+    public static final String Classification = "classification";
+    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 ProcureModelUserId = "procure_model_user_id";
+    public static final String InitialCount = "initial_count";
+    public static final String UseCount = "use_count";
+    public static final String Counts = "counts";
+    public static final String GoodsUserName = "goods_user_name";
     public static final String Beiz = "beiz";
-    public static final String UsingGoodsHisId = "using_goods_his_id";
-    public static final String DepFormScrappedId = "dep_form_scrapped_id";
-    public static final String WhGoodsId = "wh_goods_id";
-    public static final String ScrappedCounts = "scrapped_counts";
-    public static final String InitCount = "init_count";
-    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";
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -54,6 +56,9 @@
             this.setId(depFormScrappedModel.getId());
         }
         //鏅�氬睘鎬�
+        if (depFormScrappedModel.isset_depFormScrappedId) {
+            this.setDepFormScrappedId(depFormScrappedModel.getDepFormScrappedId());
+        }
         if (depFormScrappedModel.isset_depFormScrappedGoodsId) {
             this.setDepFormScrappedGoodsId(depFormScrappedModel.getDepFormScrappedGoodsId());
         }
@@ -63,35 +68,41 @@
         if (depFormScrappedModel.isset_scrappedName) {
             this.setScrappedName(depFormScrappedModel.getScrappedName());
         }
+        if (depFormScrappedModel.isset_baseGoodsTemplateId) {
+            this.setBaseGoodsTemplateId(depFormScrappedModel.getBaseGoodsTemplateId());
+        }
+        if (depFormScrappedModel.isset_baseGoodsTemplateName) {
+            this.setBaseGoodsTemplateName(depFormScrappedModel.getBaseGoodsTemplateName());
+        }
+        if (depFormScrappedModel.isset_classification) {
+            this.setClassification(depFormScrappedModel.getClassification());
+        }
+        if (depFormScrappedModel.isset_unit) {
+            this.setUnit(depFormScrappedModel.getUnit());
+        }
+        if (depFormScrappedModel.isset_baseGoodsModelsId) {
+            this.setBaseGoodsModelsId(depFormScrappedModel.getBaseGoodsModelsId());
+        }
+        if (depFormScrappedModel.isset_baseGoodsModelsName) {
+            this.setBaseGoodsModelsName(depFormScrappedModel.getBaseGoodsModelsName());
+        }
+        if (depFormScrappedModel.isset_procureModelUserId) {
+            this.setProcureModelUserId(depFormScrappedModel.getProcureModelUserId());
+        }
+        if (depFormScrappedModel.isset_initialCount) {
+            this.setInitialCount(depFormScrappedModel.getInitialCount());
+        }
+        if (depFormScrappedModel.isset_useCount) {
+            this.setUseCount(depFormScrappedModel.getUseCount());
+        }
+        if (depFormScrappedModel.isset_counts) {
+            this.setCounts(depFormScrappedModel.getCounts());
+        }
+        if (depFormScrappedModel.isset_goodsUserName) {
+            this.setGoodsUserName(depFormScrappedModel.getGoodsUserName());
+        }
         if (depFormScrappedModel.isset_beiz) {
             this.setBeiz(depFormScrappedModel.getBeiz());
-        }
-        if (depFormScrappedModel.isset_usingGoodsHisId) {
-            this.setUsingGoodsHisId(depFormScrappedModel.getUsingGoodsHisId());
-        }
-        if (depFormScrappedModel.isset_depFormScrappedId) {
-            this.setDepFormScrappedId(depFormScrappedModel.getDepFormScrappedId());
-        }
-        if (depFormScrappedModel.isset_whGoodsId) {
-            this.setWhGoodsId(depFormScrappedModel.getWhGoodsId());
-        }
-        if (depFormScrappedModel.isset_scrappedCounts) {
-            this.setScrappedCounts(depFormScrappedModel.getScrappedCounts());
-        }
-        if (depFormScrappedModel.isset_initCount) {
-            this.setInitCount(depFormScrappedModel.getInitCount());
-        }
-        if (depFormScrappedModel.isset_depFormLendingModelId) {
-            this.setDepFormLendingModelId(depFormScrappedModel.getDepFormLendingModelId());
-        }
-        if (depFormScrappedModel.isset_depFormLendingGoodsId) {
-            this.setDepFormLendingGoodsId(depFormScrappedModel.getDepFormLendingGoodsId());
-        }
-        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_());
@@ -104,12 +115,12 @@
     public String getTableName_() {
         String tableName = "dep_form_scrapped_model";
         /**
-        if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
-            return this.getDatabaseName_() + "." + tableName;
-        } else {
-            return tableName;
-        }
-        */
+         if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
+         return this.getDatabaseName_() + "." + tableName;
+         } else {
+         return tableName;
+         }
+         */
         return tableName;
     }
 
@@ -136,19 +147,22 @@
     public SqlAndParameters<Map<String, Object>> getInsertSql_() {
         InsertBuilder ib = new InsertBuilder(this.getTableName_());
         ib.set(Id, this.getId());
+        ib.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
         ib.set(DepFormScrappedGoodsId, this.getDepFormScrappedGoodsId(), this.isset_depFormScrappedGoodsId);
         ib.set(ScrappedCode, this.getScrappedCode(), this.isset_scrappedCode);
         ib.set(ScrappedName, this.getScrappedName(), this.isset_scrappedName);
+        ib.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
+        ib.set(BaseGoodsTemplateName, this.getBaseGoodsTemplateName(), this.isset_baseGoodsTemplateName);
+        ib.set(Classification, this.getClassification(), this.isset_classification);
+        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(ProcureModelUserId, this.getProcureModelUserId(), this.isset_procureModelUserId);
+        ib.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
+        ib.set(UseCount, this.getUseCount(), this.isset_useCount);
+        ib.set(Counts, this.getCounts(), this.isset_counts);
+        ib.set(GoodsUserName, this.getGoodsUserName(), this.isset_goodsUserName);
         ib.set(Beiz, this.getBeiz(), this.isset_beiz);
-        ib.set(UsingGoodsHisId, this.getUsingGoodsHisId(), this.isset_usingGoodsHisId);
-        ib.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
-        ib.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
-        ib.set(ScrappedCounts, this.getScrappedCounts(), this.isset_scrappedCounts);
-        ib.set(InitCount, this.getInitCount(), this.isset_initCount);
-        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();
     }
 
@@ -158,19 +172,22 @@
     @Override
     public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+        ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
         ub.set(DepFormScrappedGoodsId, this.getDepFormScrappedGoodsId(), this.isset_depFormScrappedGoodsId);
         ub.set(ScrappedCode, this.getScrappedCode(), this.isset_scrappedCode);
         ub.set(ScrappedName, this.getScrappedName(), this.isset_scrappedName);
+        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
+        ub.set(BaseGoodsTemplateName, this.getBaseGoodsTemplateName(), this.isset_baseGoodsTemplateName);
+        ub.set(Classification, this.getClassification(), this.isset_classification);
+        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(ProcureModelUserId, this.getProcureModelUserId(), this.isset_procureModelUserId);
+        ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
+        ub.set(UseCount, this.getUseCount(), this.isset_useCount);
+        ub.set(Counts, this.getCounts(), this.isset_counts);
+        ub.set(GoodsUserName, this.getGoodsUserName(), this.isset_goodsUserName);
         ub.set(Beiz, this.getBeiz(), this.isset_beiz);
-        ub.set(UsingGoodsHisId, this.getUsingGoodsHisId(), this.isset_usingGoodsHisId);
-        ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
-        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
-        ub.set(ScrappedCounts, this.getScrappedCounts(), this.isset_scrappedCounts);
-        ub.set(InitCount, this.getInitCount(), this.isset_initCount);
-        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();
     }
@@ -181,19 +198,22 @@
     @Override
     public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+        ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
         ub.set(DepFormScrappedGoodsId, this.getDepFormScrappedGoodsId(), this.isset_depFormScrappedGoodsId);
         ub.set(ScrappedCode, this.getScrappedCode(), this.isset_scrappedCode);
         ub.set(ScrappedName, this.getScrappedName(), this.isset_scrappedName);
+        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
+        ub.set(BaseGoodsTemplateName, this.getBaseGoodsTemplateName(), this.isset_baseGoodsTemplateName);
+        ub.set(Classification, this.getClassification(), this.isset_classification);
+        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(ProcureModelUserId, this.getProcureModelUserId(), this.isset_procureModelUserId);
+        ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
+        ub.set(UseCount, this.getUseCount(), this.isset_useCount);
+        ub.set(Counts, this.getCounts(), this.isset_counts);
+        ub.set(GoodsUserName, this.getGoodsUserName(), this.isset_goodsUserName);
         ub.set(Beiz, this.getBeiz(), this.isset_beiz);
-        ub.set(UsingGoodsHisId, this.getUsingGoodsHisId(), this.isset_usingGoodsHisId);
-        ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
-        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
-        ub.set(ScrappedCounts, this.getScrappedCounts(), this.isset_scrappedCounts);
-        ub.set(InitCount, this.getInitCount(), this.isset_initCount);
-        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);
     }
 
@@ -203,19 +223,22 @@
     @Override
     public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+        ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
         ub.set(DepFormScrappedGoodsId, this.getDepFormScrappedGoodsId(), this.isset_depFormScrappedGoodsId);
         ub.set(ScrappedCode, this.getScrappedCode(), this.isset_scrappedCode);
         ub.set(ScrappedName, this.getScrappedName(), this.isset_scrappedName);
+        ub.set(BaseGoodsTemplateId, this.getBaseGoodsTemplateId(), this.isset_baseGoodsTemplateId);
+        ub.set(BaseGoodsTemplateName, this.getBaseGoodsTemplateName(), this.isset_baseGoodsTemplateName);
+        ub.set(Classification, this.getClassification(), this.isset_classification);
+        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(ProcureModelUserId, this.getProcureModelUserId(), this.isset_procureModelUserId);
+        ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
+        ub.set(UseCount, this.getUseCount(), this.isset_useCount);
+        ub.set(Counts, this.getCounts(), this.isset_counts);
+        ub.set(GoodsUserName, this.getGoodsUserName(), this.isset_goodsUserName);
         ub.set(Beiz, this.getBeiz(), this.isset_beiz);
-        ub.set(UsingGoodsHisId, this.getUsingGoodsHisId(), this.isset_usingGoodsHisId);
-        ub.set(DepFormScrappedId, this.getDepFormScrappedId(), this.isset_depFormScrappedId);
-        ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
-        ub.set(ScrappedCounts, this.getScrappedCounts(), this.isset_scrappedCounts);
-        ub.set(InitCount, this.getInitCount(), this.isset_initCount);
-        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);
     }
 
@@ -263,7 +286,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, warehouse_id from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, dep_form_scrapped_id, dep_form_scrapped_goods_id, scrapped_code, scrapped_name, base_goods_template_id, base_goods_template_name, classification, unit, base_goods_models_id, base_goods_models_name, procure_model_user_id, initial_count, use_count, counts, goods_user_name, beiz from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -271,7 +294,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, warehouse_id from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, dep_form_scrapped_id, dep_form_scrapped_goods_id, scrapped_code, scrapped_name, base_goods_template_id, base_goods_template_name, classification, unit, base_goods_models_id, base_goods_models_name, procure_model_user_id, initial_count, use_count, counts, goods_user_name, beiz from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -308,6 +331,14 @@
             dep_form_scrapped_model.setId(rs.getLong(columnIndex));
         }
         //鏅�氬睘鎬�
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.DepFormScrappedId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_model.setDepFormScrappedId(null);
+            } else {
+                dep_form_scrapped_model.setDepFormScrappedId(rs.getLong(columnIndex));
+            }
+        }
         columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.DepFormScrappedGoodsId);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
@@ -324,81 +355,77 @@
         if (columnIndex > 0) {
             dep_form_scrapped_model.setScrappedName(rs.getString(columnIndex));
         }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.BaseGoodsTemplateId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_model.setBaseGoodsTemplateId(null);
+            } else {
+                dep_form_scrapped_model.setBaseGoodsTemplateId(rs.getLong(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.BaseGoodsTemplateName);
+        if (columnIndex > 0) {
+            dep_form_scrapped_model.setBaseGoodsTemplateName(rs.getString(columnIndex));
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Classification);
+        if (columnIndex > 0) {
+            dep_form_scrapped_model.setClassification(rs.getString(columnIndex));
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Unit);
+        if (columnIndex > 0) {
+            dep_form_scrapped_model.setUnit(rs.getString(columnIndex));
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.BaseGoodsModelsId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_model.setBaseGoodsModelsId(null);
+            } else {
+                dep_form_scrapped_model.setBaseGoodsModelsId(rs.getLong(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.BaseGoodsModelsName);
+        if (columnIndex > 0) {
+            dep_form_scrapped_model.setBaseGoodsModelsName(rs.getString(columnIndex));
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.ProcureModelUserId);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_model.setProcureModelUserId(null);
+            } else {
+                dep_form_scrapped_model.setProcureModelUserId(rs.getLong(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.InitialCount);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_model.setInitialCount(null);
+            } else {
+                dep_form_scrapped_model.setInitialCount(rs.getInt(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.UseCount);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_model.setUseCount(null);
+            } else {
+                dep_form_scrapped_model.setUseCount(rs.getInt(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Counts);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+                dep_form_scrapped_model.setCounts(null);
+            } else {
+                dep_form_scrapped_model.setCounts(rs.getInt(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.GoodsUserName);
+        if (columnIndex > 0) {
+            dep_form_scrapped_model.setGoodsUserName(rs.getString(columnIndex));
+        }
         columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.Beiz);
         if (columnIndex > 0) {
             dep_form_scrapped_model.setBeiz(rs.getString(columnIndex));
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.UsingGoodsHisId);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_model.setUsingGoodsHisId(null);
-            } else {
-                dep_form_scrapped_model.setUsingGoodsHisId(rs.getLong(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.DepFormScrappedId);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_model.setDepFormScrappedId(null);
-            } else {
-                dep_form_scrapped_model.setDepFormScrappedId(rs.getLong(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.WhGoodsId);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_model.setWhGoodsId(null);
-            } else {
-                dep_form_scrapped_model.setWhGoodsId(rs.getLong(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.ScrappedCounts);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_model.setScrappedCounts(null);
-            } else {
-                dep_form_scrapped_model.setScrappedCounts(rs.getInt(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.InitCount);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_model.setInitCount(null);
-            } else {
-                dep_form_scrapped_model.setInitCount(rs.getInt(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.DepFormLendingModelId);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_model.setDepFormLendingModelId(null);
-            } else {
-                dep_form_scrapped_model.setDepFormLendingModelId(rs.getLong(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.DepFormLendingGoodsId);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_model.setDepFormLendingGoodsId(null);
-            } else {
-                dep_form_scrapped_model.setDepFormLendingGoodsId(rs.getLong(columnIndex));
-            }
-        }
-        columnIndex = resultSetUtils.findColumn(rs, DepFormScrappedModel_mapper.DepFormLendingId);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                dep_form_scrapped_model.setDepFormLendingId(null);
-            } else {
-                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;
     }

--
Gitblit v1.9.1