From 7fc948e6ddc958a2c7379b8eb3b240f77350ce4b Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 11:02:42 +0800
Subject: [PATCH] feat: 报废后台账不对;出库后预警

---
 consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java               |   22 ++++
 consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java        |   70 ++++++++-----
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java   |   44 ++++----
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java |   41 ++++---
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java |   72 +++++---------
 5 files changed, 131 insertions(+), 118 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
index f7ea0eb..4d1358b 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -1,20 +1,10 @@
 package com.consum.base.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
 import com.consum.base.core.CodeGeneratorEnum;
 import com.consum.base.core.CodeGeneratorService;
 import com.consum.base.core.WhBusinessEnum;
 import com.consum.base.core.param.BaseWarehouseParam1;
+import com.consum.base.core.service.LWhWarningCoreServiceImpl;
 import com.consum.base.core.type.GoodsModelType;
 import com.consum.base.core.type.OutPutStatesType;
 import com.consum.base.core.utils.CurrencyUtil;
@@ -26,24 +16,23 @@
 import com.consum.base.pojo.LWhFormOutputParam;
 import com.consum.base.pojo.excel.OutputExcelTemplate;
 import com.consum.base.pojo.query.LWhFormOutputQry;
-import com.consum.base.service.BaseGoodsModelsService;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhFormOutputService;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormOutput;
-import com.consum.model.po.LWhProcureModel;
-import com.consum.model.po.WhFormOutput;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.annotation.Resource;
+import java.util.*;
 
 /**
  * @Description 鍑哄簱鍗�
@@ -67,7 +56,8 @@
     private LWhFormOutputCoreService lWhFormOutputCoreService;
     @Autowired
     private BaseGoodsModelsService baseGoodsModelsService;
-
+    @Resource
+    private LWhWarningCoreServiceImpl lWhWarningCoreService;
     private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
 
     /**
@@ -108,6 +98,7 @@
             return 0;
         }
         // 2.鏂板鐗╁搧鍨嬪彿璁板綍
+        Set<Long> allChangModelList = new HashSet<>();
         List<LWFormsOutputGoodsInfoParam> goodsList = param.getGoods();
         List<LWhProcureModel> modelList = new ArrayList<>();
         for (LWFormsOutputGoodsInfoParam goods : goodsList) {
@@ -118,6 +109,7 @@
                 lWhProcureModel.setBusinessType(GoodsModelType.OUT_PUT.getValue());
                 lWhProcureModel.setBusinessId(lWhFormOutputId);
                 lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
+                allChangModelList.add(model.getBaseGoodsModelsId());
                 // 鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
                 BaseGoodsModels baseGoodsModels =
                     this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId()));
@@ -147,6 +139,10 @@
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return 0;
         }
+        // 4 棰勮
+        //褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
+        lWhWarningCoreService.updateKuCun((short) 0, warehouseId, new ArrayList<>(allChangModelList), null, DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+
 
         return 1;
     }
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
index 1442df9..0588f87 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
@@ -1,35 +1,28 @@
 package com.consum.base.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
+import cn.hutool.core.convert.Convert;
 import com.consum.base.core.WhBusinessEnum;
 import com.consum.base.core.service.LWhWarningCoreServiceImpl;
 import com.consum.base.core.utils.IdUtil;
 import com.consum.base.core.utils.LockManage;
-import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.GoodsBaseServiceImpl;
-import com.consum.base.service.LWarehouseFlowService;
-import com.consum.base.service.LWhFormScrappedGoodsService;
-import com.consum.base.service.LWhGoodsRecordService;
-import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.*;
 import com.consum.model.po.LWarehouseFlow;
 import com.consum.model.po.LWhFormScrapped;
 import com.consum.model.po.LWhFormScrappedGoods;
 import com.consum.model.po.LWhGoodsRecord;
 import com.iplatform.model.po.S_user_core;
 import com.walker.infrastructure.utils.CollectionUtils;
-
-import cn.hutool.core.convert.Convert;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName LWhFormScrappedCoreService
@@ -147,9 +140,11 @@
                     // 鎶ュ簾鍗曠紪鍙�
                     Long transBusinessId = formScrappedGood.getTransBusinessId();
 
+                    // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
                     int goodsModelNum = 0;
                     List<Long> srappedGoodsIds = null;
                     if (warehouseType == null || warehouseType == 0) {
+                        goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 1, null);
                         srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null,
                             baseGoodsModelsId, (short)1, counts);
                     } else {
@@ -158,6 +153,14 @@
                         // 鏍规嵁鍒嗗彂鍗曘�佽鏍煎瀷鍙风紪鍙枫�佷娇鐢ㄤ汉鍛樺悕绉帮紝杩涜鎶ュ簾
                         srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId,
                             transBusinessId, userName, baseGoodsModelsId, (short)2, counts);
+                        goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 2, null);
+                    }
+
+                    if (goodsModelNum < counts) {
+                        log.error("瑕佹姤搴熺殑鐗╁搧鏁伴噺涓嶈冻");
+                        // 鎵嬪姩鍥炴粴
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        throw new RuntimeException("鍑哄簱澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
                     }
 
                     if (CollectionUtils.isEmpty(srappedGoodsIds) || srappedGoodsIds.size() < counts) {
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
index 83fe6e2..83aa02f 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
@@ -1,11 +1,22 @@
 package com.consum.base.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.*;
+import com.consum.base.pojo.LWhFormScrappedGoodsInfoParam;
+import com.consum.base.pojo.LWhFormScrappedGoodsModelParams;
+import com.consum.base.pojo.LWhFormScrappedParam;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
+import com.consum.base.pojo.excel.ScrappedInfoExcelTemplate;
+import com.consum.base.pojo.query.LWhFormScrappedQry;
+import com.consum.base.pojo.response.*;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
+import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.jdbc.service.BaseServiceImpl;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,44 +24,11 @@
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
-import com.consum.base.core.CodeGeneratorEnum;
-import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.utils.CurrencyUtil;
-import com.consum.base.core.utils.IdUtil;
-import com.consum.base.core.utils.MapUtils;
-import com.consum.base.core.utils.MapperUtil;
-import com.consum.base.core.utils.PageUtil;
-import com.consum.base.pojo.LWhFormScrappedGoodsInfoParam;
-import com.consum.base.pojo.LWhFormScrappedGoodsModelParams;
-import com.consum.base.pojo.LWhFormScrappedParam;
-import com.consum.base.pojo.dto.GoodModelInfoDTO;
-import com.consum.base.pojo.excel.ScrappedInfoExcelTemplate;
-import com.consum.base.pojo.query.LWhFormScrappedQry;
-import com.consum.base.pojo.response.FormScrappedGoodsDetailVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.GoodsTemplateCountVO;
-import com.consum.base.pojo.response.GoodsTemplateInfoVO;
-import com.consum.base.pojo.response.LWhFormScrappedExtendVO;
-import com.consum.base.service.BaseGoodsModelsService;
-import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.LWhFormScrappedGoodsService;
-import com.consum.base.service.LWhFormScrappedService;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.SDictDataServiceImpl;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormScrapped;
-import com.consum.model.po.LWhFormScrappedGoods;
-import com.consum.model.po.SDictData;
-import com.iplatform.model.po.S_user_core;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description 鎶ュ簾鍗�
@@ -125,6 +103,7 @@
         lWhFormScrapped.setOperatorName(sysInfo.getUserName());
         lWhFormScrapped.setDealTime(param.getDealTime());
         lWhFormScrapped.setStates(0);
+        lWhFormScrapped.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
         lWhFormScrapped.setUploadFiles(param.getUploadFiles());
         // 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
         FinSysTenantDepartment department = this.departmentService.getById(sysInfo.getSysDeptId());
@@ -200,15 +179,14 @@
                 scrappedGoodsList.add(scrappedGoods);
             }
             int flag2 = this.scrappedGoodsService.insertBatch(scrappedGoodsList);
-            if (flag2 != scrappedGoodsList.size()) {
+            if (flag2 == 0) {
                 log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰� 澶辫触");
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return 0;
             }
         }
         // 3.鏍规嵁鎶ュ簾鍗曟姤搴熺墿鍝�
-        Long lWarehouseFlowId =
-            this.lWhFormScrappedCoreService.outFormByTransId(lWhFormScrappedId, currentUser, param.getDealTime());
+        Long lWarehouseFlowId = this.lWhFormScrappedCoreService.outFormByTransId(lWhFormScrappedId, currentUser, param.getDealTime());
         if (lWarehouseFlowId == null) {
             log.error("鏍规嵁鍑哄簱鍗曞嚭搴� 澶辫触");
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
index 61d1c0a..3b24263 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
@@ -76,6 +76,10 @@
     @JsonIgnore
     protected boolean isset_states = false;
 
+    private Long createTime = null;
+    @JsonIgnore
+    protected boolean isset_createTime = false;
+
     /**
      * 榛樿鏋勯�犲嚱鏁�
      */
@@ -307,6 +311,20 @@
         return this.states == null;
     }
 
+    public Long getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+        this.isset_createTime = true;
+    }
+
+    @JsonIgnore
+    public boolean isEmptyCreateTime() {
+        return this.createTime == null;
+    }
+
     /**
      * 閲嶅啓 toString() 鏂规硶
      */
@@ -328,6 +346,7 @@
                 .append("departmentId=").append(this.departmentId)
                 .append("uploadFiles=").append(this.uploadFiles)
                 .append("states=").append(this.states)
+                .append("createTime=").append(this.createTime)
                 .toString();
     }
 
@@ -387,6 +406,9 @@
         if (this.isset_states) {
             l_wh_form_scrapped.setStates(this.getStates());
         }
+        if (this.isset_createTime) {
+            l_wh_form_scrapped.setCreateTime(this.getCreateTime());
+        }
         return l_wh_form_scrapped;
     }
 }
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java
index fd5aa17..40c2818 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_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;
@@ -42,6 +40,7 @@
     public static final String DepartmentId = "department_id";
     public static final String UploadFiles = "upload_files";
     public static final String States = "states";
+    public static final String CreateTime = "create_time";
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -96,6 +95,9 @@
         }
         if (lWhFormScrapped.isset_states) {
             this.setStates(lWhFormScrapped.getStates());
+        }
+        if (lWhFormScrapped.isset_createTime) {
+            this.setCreateTime(lWhFormScrapped.getCreateTime());
         }
         // 鍘绘帀锛�2022-09-07
         // this.setDatabaseName_(l_wh_form_scrapped.getDatabaseName_());
@@ -154,6 +156,7 @@
         ib.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
         ib.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles);
         ib.set(States, this.getStates(), this.isset_states);
+        ib.set(CreateTime, this.getCreateTime(), this.isset_createTime);
         return ib.genMapSql();
     }
 
@@ -177,6 +180,7 @@
         ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
         ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles);
         ub.set(States, this.getStates(), this.isset_states);
+        ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
         ub.where(this.getPkName_(), this.getPkValue_());
         return ub.genMapSql();
     }
@@ -201,6 +205,7 @@
         ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
         ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles);
         ub.set(States, this.getStates(), this.isset_states);
+        ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
         return ub.genMapSql(where, parameters);
     }
 
@@ -224,6 +229,7 @@
         ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
         ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles);
         ub.set(States, this.getStates(), this.isset_states);
+        ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
         return ub.genArraySql(where, parameters);
     }
 
@@ -271,7 +277,7 @@
      */
     @Override
     public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
-        return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_name, department_id, upload_files, states from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_name, department_id, upload_files, states, create_time from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -279,7 +285,7 @@
      */
     @Override
     public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
-        return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_name, department_id, upload_files, states from " + this.getTableName_() + " " + where, parameters);
+        return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_name, department_id, upload_files, states, create_time from " + this.getTableName_() + " " + where, parameters);
     }
 
     /**
@@ -308,100 +314,108 @@
     @Override
     public LWhFormScrapped mapRow(ResultSet rs, int i) throws SQLException {
         ResultSetUtils resultSetUtils = new ResultSetUtils();
-        LWhFormScrapped l_wh_form_scrapped = new LWhFormScrapped();
+LWhFormScrapped l_wh_form_scrapped = new LWhFormScrapped();
         Integer columnIndex;
         //涓婚敭
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.Id);
         if (columnIndex > 0) {
-            l_wh_form_scrapped.setId(rs.getLong(columnIndex));
+l_wh_form_scrapped.setId(rs.getLong(columnIndex));
         }
         //鏅�氬睘鎬�
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.LWarehouseFlowId);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setLWarehouseFlowId(null);
+l_wh_form_scrapped.setLWarehouseFlowId(null);
             } else {
-                l_wh_form_scrapped.setLWarehouseFlowId(rs.getLong(columnIndex));
+l_wh_form_scrapped.setLWarehouseFlowId(rs.getLong(columnIndex));
             }
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.BusinessFormCode);
         if (columnIndex > 0) {
-            l_wh_form_scrapped.setBusinessFormCode(rs.getString(columnIndex));
+l_wh_form_scrapped.setBusinessFormCode(rs.getString(columnIndex));
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.WarehouseType);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setWarehouseType(null);
+l_wh_form_scrapped.setWarehouseType(null);
             } else {
-                l_wh_form_scrapped.setWarehouseType(rs.getInt(columnIndex));
+l_wh_form_scrapped.setWarehouseType(rs.getInt(columnIndex));
             }
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.WarehouseId);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setWarehouseId(null);
+l_wh_form_scrapped.setWarehouseId(null);
             } else {
-                l_wh_form_scrapped.setWarehouseId(rs.getLong(columnIndex));
+l_wh_form_scrapped.setWarehouseId(rs.getLong(columnIndex));
             }
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.WarehouseName);
         if (columnIndex > 0) {
-            l_wh_form_scrapped.setWarehouseName(rs.getString(columnIndex));
+l_wh_form_scrapped.setWarehouseName(rs.getString(columnIndex));
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.AgencyId);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setAgencyId(null);
+l_wh_form_scrapped.setAgencyId(null);
             } else {
-                l_wh_form_scrapped.setAgencyId(rs.getLong(columnIndex));
+l_wh_form_scrapped.setAgencyId(rs.getLong(columnIndex));
             }
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.AgencyName);
         if (columnIndex > 0) {
-            l_wh_form_scrapped.setAgencyName(rs.getString(columnIndex));
+l_wh_form_scrapped.setAgencyName(rs.getString(columnIndex));
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.OperatorId);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setOperatorId(null);
+l_wh_form_scrapped.setOperatorId(null);
             } else {
-                l_wh_form_scrapped.setOperatorId(rs.getLong(columnIndex));
+l_wh_form_scrapped.setOperatorId(rs.getLong(columnIndex));
             }
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.OperatorName);
         if (columnIndex > 0) {
-            l_wh_form_scrapped.setOperatorName(rs.getString(columnIndex));
+l_wh_form_scrapped.setOperatorName(rs.getString(columnIndex));
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.DealTime);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setDealTime(null);
+l_wh_form_scrapped.setDealTime(null);
             } else {
-                l_wh_form_scrapped.setDealTime(rs.getLong(columnIndex));
+l_wh_form_scrapped.setDealTime(rs.getLong(columnIndex));
             }
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.DepartmentName);
         if (columnIndex > 0) {
-            l_wh_form_scrapped.setDepartmentName(rs.getString(columnIndex));
+l_wh_form_scrapped.setDepartmentName(rs.getString(columnIndex));
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.DepartmentId);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setDepartmentId(null);
+l_wh_form_scrapped.setDepartmentId(null);
             } else {
-                l_wh_form_scrapped.setDepartmentId(rs.getLong(columnIndex));
+l_wh_form_scrapped.setDepartmentId(rs.getLong(columnIndex));
             }
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.UploadFiles);
         if (columnIndex > 0) {
-            l_wh_form_scrapped.setUploadFiles(rs.getString(columnIndex));
+l_wh_form_scrapped.setUploadFiles(rs.getString(columnIndex));
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.States);
         if (columnIndex > 0) {
             if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setStates(null);
+l_wh_form_scrapped.setStates(null);
             } else {
-                l_wh_form_scrapped.setStates(rs.getInt(columnIndex));
+l_wh_form_scrapped.setStates(rs.getInt(columnIndex));
+            }
+        }
+        columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.CreateTime);
+        if (columnIndex > 0) {
+            if (rs.getBigDecimal(columnIndex) == null) {
+l_wh_form_scrapped.setCreateTime(null);
+            } else {
+l_wh_form_scrapped.setCreateTime(rs.getLong(columnIndex));
             }
         }
         return l_wh_form_scrapped;

--
Gitblit v1.9.1