From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化, 分类,物品,分发单明细,采购单明细数据导入

---
 consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java |  120 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 67 insertions(+), 53 deletions(-)

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 30a7746..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;
@@ -30,18 +28,19 @@
     // 鏅�氬睘鎬�
     public static final String LWarehouseFlowId = "l_warehouse_flow_id";
     public static final String BusinessFormCode = "business_form_code";
+    public static final String WarehouseType = "warehouse_type";
     public static final String WarehouseId = "warehouse_id";
     public static final String WarehouseName = "warehouse_name";
-    public static final String ScrappedType = "scrapped_type";
     public static final String AgencyId = "agency_id";
     public static final String AgencyName = "agency_name";
     public static final String OperatorId = "operator_id";
     public static final String OperatorName = "operator_name";
     public static final String DealTime = "deal_time";
-    public static final String DepartmentId = "department_id";
     public static final String DepartmentName = "department_name";
+    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";
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -61,14 +60,14 @@
         if (lWhFormScrapped.isset_businessFormCode) {
             this.setBusinessFormCode(lWhFormScrapped.getBusinessFormCode());
         }
+        if (lWhFormScrapped.isset_warehouseType) {
+            this.setWarehouseType(lWhFormScrapped.getWarehouseType());
+        }
         if (lWhFormScrapped.isset_warehouseId) {
             this.setWarehouseId(lWhFormScrapped.getWarehouseId());
         }
         if (lWhFormScrapped.isset_warehouseName) {
             this.setWarehouseName(lWhFormScrapped.getWarehouseName());
-        }
-        if (lWhFormScrapped.isset_scrappedType) {
-            this.setScrappedType(lWhFormScrapped.getScrappedType());
         }
         if (lWhFormScrapped.isset_agencyId) {
             this.setAgencyId(lWhFormScrapped.getAgencyId());
@@ -85,17 +84,20 @@
         if (lWhFormScrapped.isset_dealTime) {
             this.setDealTime(lWhFormScrapped.getDealTime());
         }
-        if (lWhFormScrapped.isset_departmentId) {
-            this.setDepartmentId(lWhFormScrapped.getDepartmentId());
-        }
         if (lWhFormScrapped.isset_departmentName) {
             this.setDepartmentName(lWhFormScrapped.getDepartmentName());
+        }
+        if (lWhFormScrapped.isset_departmentId) {
+            this.setDepartmentId(lWhFormScrapped.getDepartmentId());
         }
         if (lWhFormScrapped.isset_uploadFiles) {
             this.setUploadFiles(lWhFormScrapped.getUploadFiles());
         }
         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_());
@@ -142,18 +144,19 @@
         ib.set(Id, this.getId());
         ib.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
         ib.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+        ib.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
         ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
-        ib.set(ScrappedType, this.getScrappedType(), this.isset_scrappedType);
         ib.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
         ib.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
         ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
         ib.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
         ib.set(DealTime, this.getDealTime(), this.isset_dealTime);
-        ib.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
         ib.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName);
+        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();
     }
 
@@ -165,18 +168,19 @@
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
         ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
         ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
         ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
-        ub.set(ScrappedType, this.getScrappedType(), this.isset_scrappedType);
         ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
         ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
         ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
         ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
         ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
-        ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
         ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName);
+        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();
     }
@@ -189,18 +193,19 @@
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
         ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
         ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
         ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
-        ub.set(ScrappedType, this.getScrappedType(), this.isset_scrappedType);
         ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
         ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
         ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
         ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
         ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
-        ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
         ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName);
+        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);
     }
 
@@ -212,18 +217,19 @@
         UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
         ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
         ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+        ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
         ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
         ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
-        ub.set(ScrappedType, this.getScrappedType(), this.isset_scrappedType);
         ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
         ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
         ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
         ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
         ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
-        ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId);
         ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName);
+        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_id, warehouse_name, scrapped_type, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, 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_id, warehouse_name, scrapped_type, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, 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);
+            } else {
+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));
-        }
-        columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.ScrappedType);
-        if (columnIndex > 0) {
-            if (rs.getBigDecimal(columnIndex) == null) {
-                l_wh_form_scrapped.setScrappedType(null);
-            } else {
-                l_wh_form_scrapped.setScrappedType(rs.getInt(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.DepartmentId);
-        if (columnIndex > 0) {
-            l_wh_form_scrapped.setDepartmentId(rs.getString(columnIndex));
         }
         columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.DepartmentName);
         if (columnIndex > 0) {
+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.setDepartmentName(null);
+l_wh_form_scrapped.setDepartmentId(null);
             } else {
-                l_wh_form_scrapped.setDepartmentName(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