!39 添加删除标记

Merge pull request !39 from 乾坤平台/master

erp_web/pages/manage/serialNumber.html

@@ -314,8 +314,11 @@
             if (r) {
                 $.ajax({
                     type: "post",
-                    url: "/serialNumber/" + id + "/delete",
+                    url: "/serialNumber/batchDeleteSerialNumberByIds",
                     dataType: "json",
+                    data: ({
+                        ids: id
+                    }),
                     success: function (res) {
                         if(res && res.code == 200) {
                             $("#searchBtn").click();
@@ -353,7 +356,7 @@
                     }
                     $.ajax({
                         type: "post",
-                        url: "/serialNumber/batchDelete",
+                        url: "/serialNumber/batchDeleteSerialNumberByIds",
                         dataType: "json",
                         async: false,
                         data: ({

sql/jsh_erp.sql

@@ -1501,4 +1501,52 @@ alter table jsh_serial_number add tenant_id bigint(20) DEFAULT null COMMENT '租
 alter table jsh_supplier add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
 alter table jsh_systemconfig add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
 alter table jsh_unit add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
-alter table jsh_user add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
\ No newline at end of file
+alter table jsh_user add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+
+-- ----------------------------
+-- 时间：2019年3月27日
+-- version：1.0.12
+-- 此次更新
+-- 添加删除标记，将物理删除修改为逻辑删除
+-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
+-- ----------------------------
+-- 角色表	jsh_role
+alter table jsh_role add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 用户 角色 模块关系表	jsh_userbusiness
+alter table jsh_userbusiness add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 功能模块表	jsh_functions
+alter table jsh_functions add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 应用表	jsh_app
+alter table jsh_app add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 产品表	jsh_material
+alter table jsh_material add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 产品扩展字段表	jsh_materialproperty
+alter table jsh_materialproperty add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 经手人表	jsh_person
+alter table jsh_person add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 供应商 客户信息表	jsh_supplier
+alter table jsh_supplier add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 系统参数表	jsh_systemconfig
+alter table jsh_systemconfig add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 多单位表	jsh_unit
+alter table jsh_unit add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 仓库表	jsh_depot
+alter table jsh_depot add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 账户信息表	jsh_account
+alter table jsh_account add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 财务主表	jsh_accounthead
+alter table jsh_accounthead add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 财务子表	jsh_accountitem
+alter table jsh_accountitem add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 资产记录表	jsh_asset
+alter table jsh_asset add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 资产类型表	jsh_assetcategory
+alter table jsh_assetcategory add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 资产信息表	jsh_assetname
+alter table jsh_assetname add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 单据主表	jsh_depothead
+alter table jsh_depothead add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 单据子表	jsh_depotitem
+alter table jsh_depotitem add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- 收支项目表	jsh_inoutitem
+alter table jsh_inoutitem add  delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
\ No newline at end of file

src/main/java/com/jsh/erp/constants/ExceptionConstants.java

@@ -101,6 +101,9 @@ public class ExceptionConstants {
     /**商品%s下序列号不充足，请补充后重试*/
     public static final int MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE = 10500002;
     public static final String MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG = "商品:%s下序列号不充足，请补充后重试";
+    /**删序列号信息失败*/
+    public static final int SERIAL_NUMBERE_DELETE_FAILED_CODE = 10500003;
+    public static final String SERIAL_NUMBERE_DELETE_FAILED_MSG = "删序列号信息失败";
     /**
      * 机构
      * type = 110

src/main/java/com/jsh/erp/controller/RoleController.java

@@ -76,4 +76,5 @@ public class RoleController {
     public List<Role> list(HttpServletRequest request) {
         return roleService.getRole();
     }
+
 }

src/main/java/com/jsh/erp/controller/SerialNumberController.java

@@ -5,14 +5,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.SerialNumberEx;
 import com.jsh.erp.exception.BusinessParamCheckingException;
+import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.serialNumber.SerialNumberService;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -109,19 +107,26 @@ public class SerialNumberController {
         return result;
 
     }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  逻辑删除序列号信息
+     * create time: 2019/3/27 17:43
+     * @Param: ids
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "/serialNumber/batchDeleteSerialNumberByIds")
+    public Object batchDeleteSerialNumberByIds(@RequestParam("ids") String ids) throws Exception {
+        JSONObject result = ExceptionConstants.standardSuccess();
+        int i= serialNumberService.batchDeleteSerialNumberByIds(ids);
+        if(i<1){
+            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+                    ExceptionConstants.SERIAL_NUMBERE_DELETE_FAILED_CODE,ExceptionConstants.SERIAL_NUMBERE_DELETE_FAILED_MSG,ids);
+            throw new BusinessRunTimeException(ExceptionConstants.SERIAL_NUMBERE_DELETE_FAILED_CODE,
+                    ExceptionConstants.SERIAL_NUMBERE_DELETE_FAILED_MSG);
+        }
+        return result;
+    }
 
 }

src/main/java/com/jsh/erp/datasource/entities/Account.java

@@ -67,6 +67,14 @@ public class Account {
      */
     private Long tenantId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_account.Id
@@ -258,4 +266,28 @@ public class Account {
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.delete_Flag
+     *
+     * @return the value of jsh_account.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_account.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_account.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/AccountExample.java

@@ -704,6 +704,76 @@ public class AccountExample {
             addCriterion("tenant_id not between", value1, value2, "tenantId");
             return (Criteria) this;
         }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_Flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_Flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_Flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_Flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_Flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_Flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_Flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_Flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_Flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_Flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_Flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_Flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/AccountHead.java

@@ -92,6 +92,14 @@ public class AccountHead {
      */
     private Long tenantId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_accounthead.Id
@@ -355,4 +363,28 @@ public class AccountHead {
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.delete_Flag
+     *
+     * @return the value of jsh_accounthead.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_accounthead.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java

@@ -885,6 +885,76 @@ public class AccountHeadExample {
             addCriterion("tenant_id not between", value1, value2, "tenantId");
             return (Criteria) this;
         }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_Flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_Flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_Flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_Flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_Flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_Flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_Flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_Flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_Flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_Flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_Flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_Flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/AccountItem.java

@@ -59,6 +59,14 @@ public class AccountItem {
      */
     private Long tenantId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accountitem.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_accountitem.Id
@@ -226,4 +234,28 @@ public class AccountItem {
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accountitem.delete_Flag
+     *
+     * @return the value of jsh_accountitem.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accountitem.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_accountitem.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java

@@ -624,6 +624,76 @@ public class AccountItemExample {
             addCriterion("tenant_id not between", value1, value2, "tenantId");
             return (Criteria) this;
         }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_Flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_Flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_Flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_Flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_Flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_Flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_Flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_Flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_Flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_Flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_Flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_Flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/App.java

@@ -121,6 +121,14 @@ public class App {
      */
     private Boolean enabled;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_app.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_app.Id
@@ -480,4 +488,28 @@ public class App {
     public void setEnabled(Boolean enabled) {
         this.enabled = enabled;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_app.delete_Flag
+     *
+     * @return the value of jsh_app.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_app.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_app.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/AppExample.java

@@ -1193,6 +1193,76 @@ public class AppExample {
             addCriterion("Enabled not between", value1, value2, "enabled");
             return (Criteria) this;
         }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_Flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_Flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_Flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_Flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_Flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_Flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_Flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_Flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_Flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_Flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_Flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_Flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/Asset.java

@@ -148,6 +148,14 @@ public class Asset {
      */
     private Long tenantId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_asset.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column jsh_asset.description
@@ -596,6 +604,30 @@ public class Asset {
         this.tenantId = tenantId;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_asset.delete_Flag
+     *
+     * @return the value of jsh_asset.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_asset.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_asset.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_asset.description

src/main/java/com/jsh/erp/datasource/entities/AssetCategory.java

@@ -41,6 +41,14 @@ public class AssetCategory {
      */
     private Long tenantId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_assetcategory.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_assetcategory.id
@@ -160,4 +168,28 @@ public class AssetCategory {
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_assetcategory.delete_Flag
+     *
+     * @return the value of jsh_assetcategory.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_assetcategory.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_assetcategory.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/AssetCategoryExample.java

@@ -513,6 +513,76 @@ public class AssetCategoryExample {
             addCriterion("tenant_id not between", value1, value2, "tenantId");
             return (Criteria) this;
         }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_Flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_Flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_Flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_Flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_Flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_Flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_Flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_Flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_Flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_Flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_Flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_Flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/AssetExample.java

@@ -1315,6 +1315,76 @@ public class AssetExample {
             addCriterion("tenant_id not between", value1, value2, "tenantId");
             return (Criteria) this;
         }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_Flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_Flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_Flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_Flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_Flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_Flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_Flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_Flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_Flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_Flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_Flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_Flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/AssetName.java

@@ -49,6 +49,14 @@ public class AssetName {
      */
     private Long tenantId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_assetname.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column jsh_assetname.description
@@ -201,6 +209,30 @@ public class AssetName {
         this.tenantId = tenantId;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_assetname.delete_Flag
+     *
+     * @return the value of jsh_assetname.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_assetname.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_assetname.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_assetname.description

src/main/java/com/jsh/erp/datasource/entities/AssetNameExample.java

@@ -563,6 +563,76 @@ public class AssetNameExample {
             addCriterion("tenant_id not between", value1, value2, "tenantId");
             return (Criteria) this;
         }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_Flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_Flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_Flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_Flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_Flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_Flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_Flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_Flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_Flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_Flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_Flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_Flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
     }
 
     /**