purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加租户的功能

Browse Source
This commit is contained in:
季圣华
2019-03-19 23:11:38 +08:00
parent d845b9dfbe
commit 54bf489723
103 changed files with 23174 additions and 21773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/jsh/erp/ErpApplication.java
View File

@@ -2,6 +2,7 @@ package com.jsh.erp;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
@@ -10,6 +11,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.servlet.DispatcherServlet;
import javax.servlet.http.Cookie;
@SpringBootApplication
@MapperScan(basePackages = {"com.jsh.erp.datasource.mappers"})
@ServletComponentScan

100
src/main/java/com/jsh/erp/config/TenantConfig.java Normal file
View File

@@ -0,0 +1,100 @@
package com.jsh.erp.config;
import com.baomidou.mybatisplus.core.parser.ISqlParser;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.LongValue;
import org.mybatis.spring.mapper.MapperScannerConfigurer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
@Configuration
public class TenantConfig {
@Bean
public PaginationInterceptor paginationInterceptor(HttpServletRequest request) {
PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
List<ISqlParser> sqlParserList = new ArrayList<>();
TenantSqlParser tenantSqlParser = new TenantSqlParser();
tenantSqlParser.setTenantHandler(new TenantHandler() {
@Override
public Expression getTenantId() {
//从session中获取租户id
Object tenantId = request.getSession().getAttribute("tenantId");
if(tenantId!=null){
return new LongValue(Long.parseLong(tenantId.toString()));
} else {
return null;
}
}
@Override
public String getTenantIdColumn() {
return "tenant_id";
}
@Override
public boolean doTableFilter(String tableName) {
//从session中获取租户id
Object mybatisPlusStatus = request.getSession().getAttribute("mybatisPlusStatus");
if(mybatisPlusStatus !=null && mybatisPlusStatus.toString().equals("open")) {
// 这里可以判断是否过滤表
if ("databasechangelog".equals(tableName) || "databasechangeloglock".equals(tableName)
|| "jsh_materialproperty".equals(tableName) || "tbl_sequence".equals(tableName) || "dual".equals(tableName)
|| "jsh_userbusiness".equals(tableName) || "jsh_app".equals(tableName) || "jsh_functions".equals(tableName)) {
return true;
} else {
return false;
}
} else {
return true;
}
}
});
sqlParserList.add(tenantSqlParser);
paginationInterceptor.setSqlParserList(sqlParserList);
// paginationInterceptor.setSqlParserFilter(new ISqlParserFilter() {
// @Override
// public boolean doFilter(MetaObject metaObject) {
// MappedStatement ms = PluginUtils.realTarget(metaObject);
// // 过滤自定义查询此时无租户信息约束出现
// if ("com.jsh.erp.datasource.mappers.DepotHeadMapperEx.getBuildOnlyNumber".equals(ms.getId())) {
// return true;
// }
// return false;
// }
// });
return paginationInterceptor;
}
/**
* 相当于顶部的：
* {@code @MapperScan("com.jsh.erp.datasource.mappers*")}
* 这里可以扩展，比如使用配置文件来配置扫描Mapper的路径
*/
@Bean
public MapperScannerConfigurer mapperScannerConfigurer() {
MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
scannerConfigurer.setBasePackage("com.jsh.erp.datasource.mappers*");
return scannerConfigurer;
}
/**
* 性能分析拦截器，不建议生产使用
*/
@Bean
public PerformanceInterceptor performanceInterceptor(){
return new PerformanceInterceptor();
}
}

8
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -420,7 +420,7 @@ public class DepotItemController {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
String[] mpArr = mpList.split(",");
int total = depotItemService.findByAllCount(headIds, materialIds);
map.put("total", total);
@@ -533,7 +533,7 @@ public class DepotItemController {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
String[] mpArr = mpList.split(",");
int total = depotItemService.findByAllCount(headIds, materialIds);
map.put("total", total);
@@ -593,7 +593,7 @@ public class DepotItemController {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
String[] mpArr = mpList.split(",");
int total = depotItemService.findByAllCount(headIds, materialIds);
map.put("total", total);
@@ -659,7 +659,7 @@ public class DepotItemController {
Map<String, Object> map = new HashMap<String, Object>();
String message = "成功";
try {
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
//存放数据json数组
Integer pid = projectId;
String[] names = {"名称", "型号", "单位", "单价", "上月结存数量", "入库数量", "出库数量", "本月结存数量", "结存金额"};

5
src/main/java/com/jsh/erp/controller/RoleController.java
View File

@@ -71,4 +71,9 @@ public class RoleController {
}
return arr;
}
@PostMapping(value = "/list")
public List<Role> list(HttpServletRequest request) {
return roleService.getRole();
}
}

7
src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -17,11 +17,13 @@ import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.*;
@@ -36,6 +38,9 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
public class UserController {
private Logger logger = LoggerFactory.getLogger(ResourceController.class);
@Value("${mybatis-plus.status}")
private String mybatisPlusStatus;
@Resource
private UserService userService;
@@ -91,6 +96,8 @@ public class UserController {
// new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统"));
msgTip = "user can login";
request.getSession().setAttribute("user",user);
request.getSession().setAttribute("tenantId",1L); //租户id
request.getSession().setAttribute("mybatisPlusStatus",mybatisPlusStatus); //开启状态
} catch (Exception e) {
logger.error(">>>>>>>>>>>>>>>查询用户名为:" + username + " ，用户信息异常", e);
}

488
src/main/java/com/jsh/erp/datasource/entities/Account.java
View File

@@ -1,229 +1,261 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Account {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.SerialNo
*
* @mbggenerated
*/
private String serialno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.InitialAmount
*
* @mbggenerated
*/
private BigDecimal initialamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.CurrentAmount
*
* @mbggenerated
*/
private BigDecimal currentamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.IsDefault
*
* @mbggenerated
*/
private Boolean isdefault;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Id
*
* @return the value of jsh_account.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Id
*
* @param id the value for jsh_account.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Name
*
* @return the value of jsh_account.Name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Name
*
* @param name the value for jsh_account.Name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.SerialNo
*
* @return the value of jsh_account.SerialNo
*
* @mbggenerated
*/
public String getSerialno() {
return serialno;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.SerialNo
*
* @param serialno the value for jsh_account.SerialNo
*
* @mbggenerated
*/
public void setSerialno(String serialno) {
this.serialno = serialno == null ? null : serialno.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.InitialAmount
*
* @return the value of jsh_account.InitialAmount
*
* @mbggenerated
*/
public BigDecimal getInitialamount() {
return initialamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.InitialAmount
*
* @param initialamount the value for jsh_account.InitialAmount
*
* @mbggenerated
*/
public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.CurrentAmount
*
* @return the value of jsh_account.CurrentAmount
*
* @mbggenerated
*/
public BigDecimal getCurrentamount() {
return currentamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.CurrentAmount
*
* @param currentamount the value for jsh_account.CurrentAmount
*
* @mbggenerated
*/
public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Remark
*
* @return the value of jsh_account.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Remark
*
* @param remark the value for jsh_account.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.IsDefault
*
* @return the value of jsh_account.IsDefault
*
* @mbggenerated
*/
public Boolean getIsdefault() {
return isdefault;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.IsDefault
*
* @param isdefault the value for jsh_account.IsDefault
*
* @mbggenerated
*/
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Account {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.SerialNo
*
* @mbggenerated
*/
private String serialno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.InitialAmount
*
* @mbggenerated
*/
private BigDecimal initialamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.CurrentAmount
*
* @mbggenerated
*/
private BigDecimal currentamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.IsDefault
*
* @mbggenerated
*/
private Boolean isdefault;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Id
*
* @return the value of jsh_account.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Id
*
* @param id the value for jsh_account.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Name
*
* @return the value of jsh_account.Name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Name
*
* @param name the value for jsh_account.Name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.SerialNo
*
* @return the value of jsh_account.SerialNo
*
* @mbggenerated
*/
public String getSerialno() {
return serialno;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.SerialNo
*
* @param serialno the value for jsh_account.SerialNo
*
* @mbggenerated
*/
public void setSerialno(String serialno) {
this.serialno = serialno == null ? null : serialno.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.InitialAmount
*
* @return the value of jsh_account.InitialAmount
*
* @mbggenerated
*/
public BigDecimal getInitialamount() {
return initialamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.InitialAmount
*
* @param initialamount the value for jsh_account.InitialAmount
*
* @mbggenerated
*/
public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.CurrentAmount
*
* @return the value of jsh_account.CurrentAmount
*
* @mbggenerated
*/
public BigDecimal getCurrentamount() {
return currentamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.CurrentAmount
*
* @param currentamount the value for jsh_account.CurrentAmount
*
* @mbggenerated
*/
public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Remark
*
* @return the value of jsh_account.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Remark
*
* @param remark the value for jsh_account.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.IsDefault
*
* @return the value of jsh_account.IsDefault
*
* @mbggenerated
*/
public Boolean getIsdefault() {
return isdefault;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.IsDefault
*
* @param isdefault the value for jsh_account.IsDefault
*
* @mbggenerated
*/
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.tenant_id
*
* @return the value of jsh_account.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.tenant_id
*
* @param tenantId the value for jsh_account.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

1564
src/main/java/com/jsh/erp/datasource/entities/AccountExample.java
View File

File diff suppressed because it is too large Load Diff

682
src/main/java/com/jsh/erp/datasource/entities/AccountHead.java
View File

@@ -1,326 +1,358 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class AccountHead {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.OrganId
*
* @mbggenerated
*/
private Long organid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
private Long handspersonid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
private BigDecimal changeamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
private BigDecimal totalprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillNo
*
* @mbggenerated
*/
private String billno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillTime
*
* @mbggenerated
*/
private Date billtime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Id
*
* @return the value of jsh_accounthead.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Id
*
* @param id the value for jsh_accounthead.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Type
*
* @return the value of jsh_accounthead.Type
*
* @mbggenerated
*/
public String getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Type
*
* @param type the value for jsh_accounthead.Type
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.OrganId
*
* @return the value of jsh_accounthead.OrganId
*
* @mbggenerated
*/
public Long getOrganid() {
return organid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.OrganId
*
* @param organid the value for jsh_accounthead.OrganId
*
* @mbggenerated
*/
public void setOrganid(Long organid) {
this.organid = organid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.HandsPersonId
*
* @return the value of jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public Long getHandspersonid() {
return handspersonid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.HandsPersonId
*
* @param handspersonid the value for jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.ChangeAmount
*
* @return the value of jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public BigDecimal getChangeamount() {
return changeamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.ChangeAmount
*
* @param changeamount the value for jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.TotalPrice
*
* @return the value of jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public BigDecimal getTotalprice() {
return totalprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.TotalPrice
*
* @param totalprice the value for jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.AccountId
*
* @return the value of jsh_accounthead.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.AccountId
*
* @param accountid the value for jsh_accounthead.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillNo
*
* @return the value of jsh_accounthead.BillNo
*
* @mbggenerated
*/
public String getBillno() {
return billno;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillNo
*
* @param billno the value for jsh_accounthead.BillNo
*
* @mbggenerated
*/
public void setBillno(String billno) {
this.billno = billno == null ? null : billno.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillTime
*
* @return the value of jsh_accounthead.BillTime
*
* @mbggenerated
*/
public Date getBilltime() {
return billtime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillTime
*
* @param billtime the value for jsh_accounthead.BillTime
*
* @mbggenerated
*/
public void setBilltime(Date billtime) {
this.billtime = billtime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Remark
*
* @return the value of jsh_accounthead.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Remark
*
* @param remark the value for jsh_accounthead.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class AccountHead {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.OrganId
*
* @mbggenerated
*/
private Long organid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
private Long handspersonid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
private BigDecimal changeamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
private BigDecimal totalprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillNo
*
* @mbggenerated
*/
private String billno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillTime
*
* @mbggenerated
*/
private Date billtime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Id
*
* @return the value of jsh_accounthead.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Id
*
* @param id the value for jsh_accounthead.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Type
*
* @return the value of jsh_accounthead.Type
*
* @mbggenerated
*/
public String getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Type
*
* @param type the value for jsh_accounthead.Type
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.OrganId
*
* @return the value of jsh_accounthead.OrganId
*
* @mbggenerated
*/
public Long getOrganid() {
return organid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.OrganId
*
* @param organid the value for jsh_accounthead.OrganId
*
* @mbggenerated
*/
public void setOrganid(Long organid) {
this.organid = organid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.HandsPersonId
*
* @return the value of jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public Long getHandspersonid() {
return handspersonid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.HandsPersonId
*
* @param handspersonid the value for jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.ChangeAmount
*
* @return the value of jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public BigDecimal getChangeamount() {
return changeamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.ChangeAmount
*
* @param changeamount the value for jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.TotalPrice
*
* @return the value of jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public BigDecimal getTotalprice() {
return totalprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.TotalPrice
*
* @param totalprice the value for jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.AccountId
*
* @return the value of jsh_accounthead.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.AccountId
*
* @param accountid the value for jsh_accounthead.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillNo
*
* @return the value of jsh_accounthead.BillNo
*
* @mbggenerated
*/
public String getBillno() {
return billno;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillNo
*
* @param billno the value for jsh_accounthead.BillNo
*
* @mbggenerated
*/
public void setBillno(String billno) {
this.billno = billno == null ? null : billno.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillTime
*
* @return the value of jsh_accounthead.BillTime
*
* @mbggenerated
*/
public Date getBilltime() {
return billtime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillTime
*
* @param billtime the value for jsh_accounthead.BillTime
*
* @mbggenerated
*/
public void setBilltime(Date billtime) {
this.billtime = billtime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Remark
*
* @return the value of jsh_accounthead.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Remark
*
* @param remark the value for jsh_accounthead.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.tenant_id
*
* @return the value of jsh_accounthead.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.tenant_id
*
* @param tenantId the value for jsh_accounthead.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

1926
src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java
View File

File diff suppressed because it is too large Load Diff

10
src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
View File

@@ -25,6 +25,8 @@ public class AccountHeadVo4ListEx {
private String remark;
private Long tenantId;
private String organname;
private String handspersonname;
@@ -111,6 +113,14 @@ public class AccountHeadVo4ListEx {
this.remark = remark;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
public String getOrganname() {
return organname;
}

424
src/main/java/com/jsh/erp/datasource/entities/AccountItem.java
View File

@@ -1,197 +1,229 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class AccountItem {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.HeaderId
*
* @mbggenerated
*/
private Long headerid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
private Long inoutitemid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.EachAmount
*
* @mbggenerated
*/
private BigDecimal eachamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Id
*
* @return the value of jsh_accountitem.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Id
*
* @param id the value for jsh_accountitem.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.HeaderId
*
* @return the value of jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public Long getHeaderid() {
return headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.HeaderId
*
* @param headerid the value for jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.AccountId
*
* @return the value of jsh_accountitem.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.AccountId
*
* @param accountid the value for jsh_accountitem.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.InOutItemId
*
* @return the value of jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public Long getInoutitemid() {
return inoutitemid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.InOutItemId
*
* @param inoutitemid the value for jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.EachAmount
*
* @return the value of jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public BigDecimal getEachamount() {
return eachamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.EachAmount
*
* @param eachamount the value for jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Remark
*
* @return the value of jsh_accountitem.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Remark
*
* @param remark the value for jsh_accountitem.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class AccountItem {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.HeaderId
*
* @mbggenerated
*/
private Long headerid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
private Long inoutitemid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.EachAmount
*
* @mbggenerated
*/
private BigDecimal eachamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Id
*
* @return the value of jsh_accountitem.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Id
*
* @param id the value for jsh_accountitem.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.HeaderId
*
* @return the value of jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public Long getHeaderid() {
return headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.HeaderId
*
* @param headerid the value for jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.AccountId
*
* @return the value of jsh_accountitem.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.AccountId
*
* @param accountid the value for jsh_accountitem.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.InOutItemId
*
* @return the value of jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public Long getInoutitemid() {
return inoutitemid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.InOutItemId
*
* @param inoutitemid the value for jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.EachAmount
*
* @return the value of jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public BigDecimal getEachamount() {
return eachamount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.EachAmount
*
* @param eachamount the value for jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Remark
*
* @return the value of jsh_accountitem.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Remark
*
* @param remark the value for jsh_accountitem.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.tenant_id
*
* @return the value of jsh_accountitem.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.tenant_id
*
* @param tenantId the value for jsh_accountitem.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

1404
src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java
View File

File diff suppressed because it is too large Load Diff

1258
src/main/java/com/jsh/erp/datasource/entities/Asset.java
View File

File diff suppressed because it is too large Load Diff

32
src/main/java/com/jsh/erp/datasource/entities/AssetCategory.java
View File

@@ -33,6 +33,14 @@ public class AssetCategory {
*/
private String description;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetcategory.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetcategory.id
@@ -128,4 +136,28 @@ public class AssetCategory {
public void setDescription(String description) {
this.description = description == null ? null : description.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetcategory.tenant_id
*
* @return the value of jsh_assetcategory.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetcategory.tenant_id
*
* @param tenantId the value for jsh_assetcategory.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/AssetCategoryExample.java
View File

@@ -453,6 +453,66 @@ public class AssetCategoryExample {
addCriterion("description not between", value1, value2, "description");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

2786
src/main/java/com/jsh/erp/datasource/entities/AssetExample.java
View File

File diff suppressed because it is too large Load Diff

32
src/main/java/com/jsh/erp/datasource/entities/AssetName.java
View File

@@ -41,6 +41,14 @@ public class AssetName {
*/
private Short isconsumables;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetname.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetname.description
@@ -169,6 +177,30 @@ public class AssetName {
this.isconsumables = isconsumables;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetname.tenant_id
*
* @return the value of jsh_assetname.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetname.tenant_id
*
* @param tenantId the value for jsh_assetname.tenant_id
*
* @mbggenerated
*/
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_assetname.description

60
src/main/java/com/jsh/erp/datasource/entities/AssetNameExample.java
View File

@@ -503,6 +503,66 @@ public class AssetNameExample {
addCriterion("isconsumables not between", value1, value2, "isconsumables");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

616
src/main/java/com/jsh/erp/datasource/entities/Depot.java
View File

@@ -1,293 +1,325 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Depot {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.address
*
* @mbggenerated
*/
private String address;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.warehousing
*
* @mbggenerated
*/
private BigDecimal warehousing;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.truckage
*
* @mbggenerated
*/
private BigDecimal truckage;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.type
*
* @mbggenerated
*/
private Integer type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.principal
*
* @mbggenerated
*/
private Long principal;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.id
*
* @return the value of jsh_depot.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.id
*
* @param id the value for jsh_depot.id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.name
*
* @return the value of jsh_depot.name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.name
*
* @param name the value for jsh_depot.name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.address
*
* @return the value of jsh_depot.address
*
* @mbggenerated
*/
public String getAddress() {
return address;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.address
*
* @param address the value for jsh_depot.address
*
* @mbggenerated
*/
public void setAddress(String address) {
this.address = address == null ? null : address.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.warehousing
*
* @return the value of jsh_depot.warehousing
*
* @mbggenerated
*/
public BigDecimal getWarehousing() {
return warehousing;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.warehousing
*
* @param warehousing the value for jsh_depot.warehousing
*
* @mbggenerated
*/
public void setWarehousing(BigDecimal warehousing) {
this.warehousing = warehousing;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.truckage
*
* @return the value of jsh_depot.truckage
*
* @mbggenerated
*/
public BigDecimal getTruckage() {
return truckage;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.truckage
*
* @param truckage the value for jsh_depot.truckage
*
* @mbggenerated
*/
public void setTruckage(BigDecimal truckage) {
this.truckage = truckage;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.type
*
* @return the value of jsh_depot.type
*
* @mbggenerated
*/
public Integer getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.type
*
* @param type the value for jsh_depot.type
*
* @mbggenerated
*/
public void setType(Integer type) {
this.type = type;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.sort
*
* @return the value of jsh_depot.sort
*
* @mbggenerated
*/
public String getSort() {
return sort;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.sort
*
* @param sort the value for jsh_depot.sort
*
* @mbggenerated
*/
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.remark
*
* @return the value of jsh_depot.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.remark
*
* @param remark the value for jsh_depot.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.principal
*
* @return the value of jsh_depot.principal
*
* @mbggenerated
*/
public Long getPrincipal() {
return principal;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.principal
*
* @param principal the value for jsh_depot.principal
*
* @mbggenerated
*/
public void setPrincipal(Long principal) {
this.principal = principal;
}
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Depot {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.address
*
* @mbggenerated
*/
private String address;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.warehousing
*
* @mbggenerated
*/
private BigDecimal warehousing;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.truckage
*
* @mbggenerated
*/
private BigDecimal truckage;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.type
*
* @mbggenerated
*/
private Integer type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.principal
*
* @mbggenerated
*/
private Long principal;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.id
*
* @return the value of jsh_depot.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.id
*
* @param id the value for jsh_depot.id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.name
*
* @return the value of jsh_depot.name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.name
*
* @param name the value for jsh_depot.name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.address
*
* @return the value of jsh_depot.address
*
* @mbggenerated
*/
public String getAddress() {
return address;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.address
*
* @param address the value for jsh_depot.address
*
* @mbggenerated
*/
public void setAddress(String address) {
this.address = address == null ? null : address.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.warehousing
*
* @return the value of jsh_depot.warehousing
*
* @mbggenerated
*/
public BigDecimal getWarehousing() {
return warehousing;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.warehousing
*
* @param warehousing the value for jsh_depot.warehousing
*
* @mbggenerated
*/
public void setWarehousing(BigDecimal warehousing) {
this.warehousing = warehousing;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.truckage
*
* @return the value of jsh_depot.truckage
*
* @mbggenerated
*/
public BigDecimal getTruckage() {
return truckage;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.truckage
*
* @param truckage the value for jsh_depot.truckage
*
* @mbggenerated
*/
public void setTruckage(BigDecimal truckage) {
this.truckage = truckage;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.type
*
* @return the value of jsh_depot.type
*
* @mbggenerated
*/
public Integer getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.type
*
* @param type the value for jsh_depot.type
*
* @mbggenerated
*/
public void setType(Integer type) {
this.type = type;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.sort
*
* @return the value of jsh_depot.sort
*
* @mbggenerated
*/
public String getSort() {
return sort;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.sort
*
* @param sort the value for jsh_depot.sort
*
* @mbggenerated
*/
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.remark
*
* @return the value of jsh_depot.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.remark
*
* @param remark the value for jsh_depot.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.principal
*
* @return the value of jsh_depot.principal
*
* @mbggenerated
*/
public Long getPrincipal() {
return principal;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.principal
*
* @param principal the value for jsh_depot.principal
*
* @mbggenerated
*/
public void setPrincipal(Long principal) {
this.principal = principal;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.tenant_id
*
* @return the value of jsh_depot.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.tenant_id
*
* @param tenantId the value for jsh_depot.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

1824
src/main/java/com/jsh/erp/datasource/entities/DepotExample.java
View File

File diff suppressed because it is too large Load Diff

32
src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
View File

@@ -236,6 +236,14 @@ public class DepotHead {
*/
private String linknumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depothead.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depothead.Id
@@ -931,4 +939,28 @@ public class DepotHead {
public void setLinknumber(String linknumber) {
this.linknumber = linknumber == null ? null : linknumber.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depothead.tenant_id
*
* @return the value of jsh_depothead.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depothead.tenant_id
*
* @param tenantId the value for jsh_depothead.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View File

@@ -2075,6 +2075,66 @@ public class DepotHeadExample {
addCriterion("LinkNumber not between", value1, value2, "linknumber");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

1512
src/main/java/com/jsh/erp/datasource/entities/DepotItem.java
View File

File diff suppressed because it is too large Load Diff

3604
src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java
View File

File diff suppressed because it is too large Load Diff

232
src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4Material.java
View File

@@ -3,242 +3,12 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class DepotItemVo4Material {
private Long id;
private Long headerid;
private Long materialid;
private String munit;
private BigDecimal opernumber;
private BigDecimal basicnumber;
private BigDecimal unitprice;
private BigDecimal taxunitprice;
private BigDecimal allprice;
private String remark;
private String img;
private BigDecimal incidentals;
private Long depotid;
private Long anotherdepotid;
private BigDecimal taxrate;
private BigDecimal taxmoney;
private BigDecimal taxlastmoney;
private String otherfield1;
private String otherfield2;
private String otherfield3;
private String otherfield4;
private String otherfield5;
private String mtype;
public class DepotItemVo4Material extends DepotItem{
private String mname;
private String mmodel;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getHeaderid() {
return headerid;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
public Long getMaterialid() {
return materialid;
}
public void setMaterialid(Long materialid) {
this.materialid = materialid;
}
public String getMunit() {
return munit;
}
public void setMunit(String munit) {
this.munit = munit;
}
public BigDecimal getOpernumber() {
return opernumber;
}
public void setOpernumber(BigDecimal opernumber) {
this.opernumber = opernumber;
}
public BigDecimal getBasicnumber() {
return basicnumber;
}
public void setBasicnumber(BigDecimal basicnumber) {
this.basicnumber = basicnumber;
}
public BigDecimal getUnitprice() {
return unitprice;
}
public void setUnitprice(BigDecimal unitprice) {
this.unitprice = unitprice;
}
public BigDecimal getTaxunitprice() {
return taxunitprice;
}
public void setTaxunitprice(BigDecimal taxunitprice) {
this.taxunitprice = taxunitprice;
}
public BigDecimal getAllprice() {
return allprice;
}
public void setAllprice(BigDecimal allprice) {
this.allprice = allprice;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public BigDecimal getIncidentals() {
return incidentals;
}
public void setIncidentals(BigDecimal incidentals) {
this.incidentals = incidentals;
}
public Long getDepotid() {
return depotid;
}
public void setDepotid(Long depotid) {
this.depotid = depotid;
}
public Long getAnotherdepotid() {
return anotherdepotid;
}
public void setAnotherdepotid(Long anotherdepotid) {
this.anotherdepotid = anotherdepotid;
}
public BigDecimal getTaxrate() {
return taxrate;
}
public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate;
}
public BigDecimal getTaxmoney() {
return taxmoney;
}
public void setTaxmoney(BigDecimal taxmoney) {
this.taxmoney = taxmoney;
}
public BigDecimal getTaxlastmoney() {
return taxlastmoney;
}
public void setTaxlastmoney(BigDecimal taxlastmoney) {
this.taxlastmoney = taxlastmoney;
}
public String getOtherfield1() {
return otherfield1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1;
}
public String getOtherfield2() {
return otherfield2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2;
}
public String getOtherfield3() {
return otherfield3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3;
}
public String getOtherfield4() {
return otherfield4;
}
public void setOtherfield4(String otherfield4) {
this.otherfield4 = otherfield4;
}
public String getOtherfield5() {
return otherfield5;
}
public void setOtherfield5(String otherfield5) {
this.otherfield5 = otherfield5;
}
public String getMtype() {
return mtype;
}
public void setMtype(String mtype) {
this.mtype = mtype;
}
public String getMname() {
return mname;
}

234
src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
View File

@@ -1,54 +1,6 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class DepotItemVo4WithInfoEx {
private Long id;
private Long headerid;
private Long materialid;
private String munit;
private BigDecimal opernumber;
private BigDecimal basicnumber;
private BigDecimal unitprice;
private BigDecimal taxunitprice;
private BigDecimal allprice;
private String remark;
private String img;
private BigDecimal incidentals;
private Long depotid;
private Long anotherdepotid;
private BigDecimal taxrate;
private BigDecimal taxmoney;
private BigDecimal taxlastmoney;
private String otherfield1;
private String otherfield2;
private String otherfield3;
private String otherfield4;
private String otherfield5;
private String mtype;
public class DepotItemVo4WithInfoEx extends DepotItem{
private Long MId;
@@ -78,190 +30,6 @@ public class DepotItemVo4WithInfoEx {
private String UName;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getHeaderid() {
return headerid;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
public Long getMaterialid() {
return materialid;
}
public void setMaterialid(Long materialid) {
this.materialid = materialid;
}
public String getMunit() {
return munit;
}
public void setMunit(String munit) {
this.munit = munit;
}
public BigDecimal getOpernumber() {
return opernumber;
}
public void setOpernumber(BigDecimal opernumber) {
this.opernumber = opernumber;
}
public BigDecimal getBasicnumber() {
return basicnumber;
}
public void setBasicnumber(BigDecimal basicnumber) {
this.basicnumber = basicnumber;
}
public BigDecimal getUnitprice() {
return unitprice;
}
public void setUnitprice(BigDecimal unitprice) {
this.unitprice = unitprice;
}
public BigDecimal getTaxunitprice() {
return taxunitprice;
}
public void setTaxunitprice(BigDecimal taxunitprice) {
this.taxunitprice = taxunitprice;
}
public BigDecimal getAllprice() {
return allprice;
}
public void setAllprice(BigDecimal allprice) {
this.allprice = allprice;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public BigDecimal getIncidentals() {
return incidentals;
}
public void setIncidentals(BigDecimal incidentals) {
this.incidentals = incidentals;
}
public Long getDepotid() {
return depotid;
}
public void setDepotid(Long depotid) {
this.depotid = depotid;
}
public Long getAnotherdepotid() {
return anotherdepotid;
}
public void setAnotherdepotid(Long anotherdepotid) {
this.anotherdepotid = anotherdepotid;
}
public BigDecimal getTaxrate() {
return taxrate;
}
public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate;
}
public BigDecimal getTaxmoney() {
return taxmoney;
}
public void setTaxmoney(BigDecimal taxmoney) {
this.taxmoney = taxmoney;
}
public BigDecimal getTaxlastmoney() {
return taxlastmoney;
}
public void setTaxlastmoney(BigDecimal taxlastmoney) {
this.taxlastmoney = taxlastmoney;
}
public String getOtherfield1() {
return otherfield1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1;
}
public String getOtherfield2() {
return otherfield2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2;
}
public String getOtherfield3() {
return otherfield3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3;
}
public String getOtherfield4() {
return otherfield4;
}
public void setOtherfield4(String otherfield4) {
this.otherfield4 = otherfield4;
}
public String getOtherfield5() {
return otherfield5;
}
public void setOtherfield5(String otherfield5) {
this.otherfield5 = otherfield5;
}
public String getMtype() {
return mtype;
}
public void setMtype(String mtype) {
this.mtype = mtype;
}
public Long getMId() {
return MId;
}

32
src/main/java/com/jsh/erp/datasource/entities/InOutItem.java
View File

@@ -33,6 +33,14 @@ public class InOutItem {
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_inoutitem.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_inoutitem.Id
@@ -128,4 +136,28 @@ public class InOutItem {
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_inoutitem.tenant_id
*
* @return the value of jsh_inoutitem.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_inoutitem.tenant_id
*
* @param tenantId the value for jsh_inoutitem.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java
View File

@@ -463,6 +463,66 @@ public class InOutItemExample {
addCriterion("Remark not between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

32
src/main/java/com/jsh/erp/datasource/entities/Log.java
View File

@@ -67,6 +67,14 @@ public class Log {
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_log.id
@@ -258,4 +266,28 @@ public class Log {
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_log.tenant_id
*
* @return the value of jsh_log.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_log.tenant_id
*
* @param tenantId the value for jsh_log.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/LogExample.java
View File

@@ -714,6 +714,66 @@ public class LogExample {
addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

1557
src/main/java/com/jsh/erp/datasource/entities/Material.java
View File

File diff suppressed because it is too large Load Diff

808
src/main/java/com/jsh/erp/datasource/entities/MaterialCategory.java
View File

@@ -1,389 +1,421 @@
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class MaterialCategory {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
private Short categorylevel;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.ParentId
*
* @mbggenerated
*/
private Long parentid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.status
*
* @mbggenerated
*/
private String status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.serial_no
*
* @mbggenerated
*/
private String serialNo;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.create_time
*
* @mbggenerated
*/
private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.creator
*
* @mbggenerated
*/
private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.update_time
*
* @mbggenerated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.updater
*
* @mbggenerated
*/
private Long updater;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.Id
*
* @return the value of jsh_materialcategory.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.Id
*
* @param id the value for jsh_materialcategory.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.Name
*
* @return the value of jsh_materialcategory.Name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.Name
*
* @param name the value for jsh_materialcategory.Name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.CategoryLevel
*
* @return the value of jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
public Short getCategorylevel() {
return categorylevel;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.CategoryLevel
*
* @param categorylevel the value for jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
public void setCategorylevel(Short categorylevel) {
this.categorylevel = categorylevel;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.ParentId
*
* @return the value of jsh_materialcategory.ParentId
*
* @mbggenerated
*/
public Long getParentid() {
return parentid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.ParentId
*
* @param parentid the value for jsh_materialcategory.ParentId
*
* @mbggenerated
*/
public void setParentid(Long parentid) {
this.parentid = parentid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.sort
*
* @return the value of jsh_materialcategory.sort
*
* @mbggenerated
*/
public String getSort() {
return sort;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.sort
*
* @param sort the value for jsh_materialcategory.sort
*
* @mbggenerated
*/
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.status
*
* @return the value of jsh_materialcategory.status
*
* @mbggenerated
*/
public String getStatus() {
return status;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.status
*
* @param status the value for jsh_materialcategory.status
*
* @mbggenerated
*/
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.serial_no
*
* @return the value of jsh_materialcategory.serial_no
*
* @mbggenerated
*/
public String getSerialNo() {
return serialNo;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.serial_no
*
* @param serialNo the value for jsh_materialcategory.serial_no
*
* @mbggenerated
*/
public void setSerialNo(String serialNo) {
this.serialNo = serialNo == null ? null : serialNo.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.remark
*
* @return the value of jsh_materialcategory.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.remark
*
* @param remark the value for jsh_materialcategory.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.create_time
*
* @return the value of jsh_materialcategory.create_time
*
* @mbggenerated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.create_time
*
* @param createTime the value for jsh_materialcategory.create_time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.creator
*
* @return the value of jsh_materialcategory.creator
*
* @mbggenerated
*/
public Long getCreator() {
return creator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.creator
*
* @param creator the value for jsh_materialcategory.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) {
this.creator = creator;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.update_time
*
* @return the value of jsh_materialcategory.update_time
*
* @mbggenerated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.update_time
*
* @param updateTime the value for jsh_materialcategory.update_time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.updater
*
* @return the value of jsh_materialcategory.updater
*
* @mbggenerated
*/
public Long getUpdater() {
return updater;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.updater
*
* @param updater the value for jsh_materialcategory.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) {
this.updater = updater;
}
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class MaterialCategory {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
private Short categorylevel;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.ParentId
*
* @mbggenerated
*/
private Long parentid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.status
*
* @mbggenerated
*/
private String status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.serial_no
*
* @mbggenerated
*/
private String serialNo;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.create_time
*
* @mbggenerated
*/
private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.creator
*
* @mbggenerated
*/
private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.update_time
*
* @mbggenerated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.updater
*
* @mbggenerated
*/
private Long updater;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.Id
*
* @return the value of jsh_materialcategory.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.Id
*
* @param id the value for jsh_materialcategory.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.Name
*
* @return the value of jsh_materialcategory.Name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.Name
*
* @param name the value for jsh_materialcategory.Name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.CategoryLevel
*
* @return the value of jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
public Short getCategorylevel() {
return categorylevel;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.CategoryLevel
*
* @param categorylevel the value for jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
public void setCategorylevel(Short categorylevel) {
this.categorylevel = categorylevel;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.ParentId
*
* @return the value of jsh_materialcategory.ParentId
*
* @mbggenerated
*/
public Long getParentid() {
return parentid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.ParentId
*
* @param parentid the value for jsh_materialcategory.ParentId
*
* @mbggenerated
*/
public void setParentid(Long parentid) {
this.parentid = parentid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.sort
*
* @return the value of jsh_materialcategory.sort
*
* @mbggenerated
*/
public String getSort() {
return sort;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.sort
*
* @param sort the value for jsh_materialcategory.sort
*
* @mbggenerated
*/
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.status
*
* @return the value of jsh_materialcategory.status
*
* @mbggenerated
*/
public String getStatus() {
return status;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.status
*
* @param status the value for jsh_materialcategory.status
*
* @mbggenerated
*/
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.serial_no
*
* @return the value of jsh_materialcategory.serial_no
*
* @mbggenerated
*/
public String getSerialNo() {
return serialNo;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.serial_no
*
* @param serialNo the value for jsh_materialcategory.serial_no
*
* @mbggenerated
*/
public void setSerialNo(String serialNo) {
this.serialNo = serialNo == null ? null : serialNo.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.remark
*
* @return the value of jsh_materialcategory.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.remark
*
* @param remark the value for jsh_materialcategory.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.create_time
*
* @return the value of jsh_materialcategory.create_time
*
* @mbggenerated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.create_time
*
* @param createTime the value for jsh_materialcategory.create_time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.creator
*
* @return the value of jsh_materialcategory.creator
*
* @mbggenerated
*/
public Long getCreator() {
return creator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.creator
*
* @param creator the value for jsh_materialcategory.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) {
this.creator = creator;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.update_time
*
* @return the value of jsh_materialcategory.update_time
*
* @mbggenerated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.update_time
*
* @param updateTime the value for jsh_materialcategory.update_time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.updater
*
* @return the value of jsh_materialcategory.updater
*
* @mbggenerated
*/
public Long getUpdater() {
return updater;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.updater
*
* @param updater the value for jsh_materialcategory.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) {
this.updater = updater;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.tenant_id
*
* @return the value of jsh_materialcategory.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.tenant_id
*
* @param tenantId the value for jsh_materialcategory.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

2204
src/main/java/com/jsh/erp/datasource/entities/MaterialCategoryExample.java
View File

File diff suppressed because it is too large Load Diff

3820
src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
View File

File diff suppressed because it is too large Load Diff

245
src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
View File

@@ -2,248 +2,13 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class MaterialVo4Unit {
private Long id;
private Long categoryid;
private String name;
private String mfrs;
private BigDecimal packing;
private BigDecimal safetystock;
private String model;
private String standard;
private String color;
private String unit;
private String remark;
private BigDecimal retailprice;
private BigDecimal lowprice;
private BigDecimal presetpriceone;
private BigDecimal presetpricetwo;
private Long unitid;
private String firstoutunit;
private String firstinunit;
private String pricestrategy;
private Boolean enabled;
private String otherfield1;
private String otherfield2;
private String otherfield3;
public class MaterialVo4Unit extends Material{
private String unitName;
private String categoryName;
private String materialOther;
/**
* 2019-01-21新增字段enableSerialNumber
*是否开启序列号
* */
private String enableSerialNumber;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getCategoryid() {
return categoryid;
}
public void setCategoryid(Long categoryid) {
this.categoryid = categoryid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getMfrs() {
return mfrs;
}
public void setMfrs(String mfrs) {
this.mfrs = mfrs;
}
public BigDecimal getPacking() {
return packing;
}
public void setPacking(BigDecimal packing) {
this.packing = packing;
}
public BigDecimal getSafetystock() {
return safetystock;
}
public void setSafetystock(BigDecimal safetystock) {
this.safetystock = safetystock;
}
public String getModel() {
return model;
}
public void setModel(String model) {
this.model = model;
}
public String getStandard() {
return standard;
}
public void setStandard(String standard) {
this.standard = standard;
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public BigDecimal getRetailprice() {
return retailprice;
}
public void setRetailprice(BigDecimal retailprice) {
this.retailprice = retailprice;
}
public BigDecimal getLowprice() {
return lowprice;
}
public void setLowprice(BigDecimal lowprice) {
this.lowprice = lowprice;
}
public BigDecimal getPresetpriceone() {
return presetpriceone;
}
public void setPresetpriceone(BigDecimal presetpriceone) {
this.presetpriceone = presetpriceone;
}
public BigDecimal getPresetpricetwo() {
return presetpricetwo;
}
public void setPresetpricetwo(BigDecimal presetpricetwo) {
this.presetpricetwo = presetpricetwo;
}
public Long getUnitid() {
return unitid;
}
public void setUnitid(Long unitid) {
this.unitid = unitid;
}
public String getFirstoutunit() {
return firstoutunit;
}
public void setFirstoutunit(String firstoutunit) {
this.firstoutunit = firstoutunit;
}
public String getFirstinunit() {
return firstinunit;
}
public void setFirstinunit(String firstinunit) {
this.firstinunit = firstinunit;
}
public String getPricestrategy() {
return pricestrategy;
}
public void setPricestrategy(String pricestrategy) {
this.pricestrategy = pricestrategy;
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
public String getOtherfield1() {
return otherfield1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1;
}
public String getOtherfield2() {
return otherfield2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2;
}
public String getOtherfield3() {
return otherfield3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3;
}
public String getUnitName() {
return unitName;
@@ -268,12 +33,4 @@ public class MaterialVo4Unit {
public void setMaterialOther(String materialOther) {
this.materialOther = materialOther;
}
public String getEnableSerialNumber() {
return enableSerialNumber;
}
public void setEnableSerialNumber(String enableSerialNumber) {
this.enableSerialNumber = enableSerialNumber;
}
}

616
src/main/java/com/jsh/erp/datasource/entities/OrgaUserRel.java
View File

@@ -1,293 +1,325 @@
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class OrgaUserRel {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.orga_id
*
* @mbggenerated
*/
private Long orgaId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.user_id
*
* @mbggenerated
*/
private Long userId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @mbggenerated
*/
private String userBlngOrgaDsplSeq;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.delete_flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.create_time
*
* @mbggenerated
*/
private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.creator
*
* @mbggenerated
*/
private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.update_time
*
* @mbggenerated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.updater
*
* @mbggenerated
*/
private Long updater;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.id
*
* @return the value of jsh_orga_user_rel.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.id
*
* @param id the value for jsh_orga_user_rel.id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.orga_id
*
* @return the value of jsh_orga_user_rel.orga_id
*
* @mbggenerated
*/
public Long getOrgaId() {
return orgaId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.orga_id
*
* @param orgaId the value for jsh_orga_user_rel.orga_id
*
* @mbggenerated
*/
public void setOrgaId(Long orgaId) {
this.orgaId = orgaId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.user_id
*
* @return the value of jsh_orga_user_rel.user_id
*
* @mbggenerated
*/
public Long getUserId() {
return userId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.user_id
*
* @param userId the value for jsh_orga_user_rel.user_id
*
* @mbggenerated
*/
public void setUserId(Long userId) {
this.userId = userId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @return the value of jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @mbggenerated
*/
public String getUserBlngOrgaDsplSeq() {
return userBlngOrgaDsplSeq;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @param userBlngOrgaDsplSeq the value for jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @mbggenerated
*/
public void setUserBlngOrgaDsplSeq(String userBlngOrgaDsplSeq) {
this.userBlngOrgaDsplSeq = userBlngOrgaDsplSeq == null ? null : userBlngOrgaDsplSeq.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.delete_flag
*
* @return the value of jsh_orga_user_rel.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_orga_user_rel.delete_flag
*
* @param deleteFlag the value for jsh_orga_user_rel.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_orga_user_rel.create_time
*
* @return the value of jsh_orga_user_rel.create_time
*
* @mbggenerated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.create_time
*
* @param createTime the value for jsh_orga_user_rel.create_time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.creator
*
* @return the value of jsh_orga_user_rel.creator
*
* @mbggenerated
*/
public Long getCreator() {
return creator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.creator
*
* @param creator the value for jsh_orga_user_rel.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) {
this.creator = creator;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.update_time
*
* @return the value of jsh_orga_user_rel.update_time
*
* @mbggenerated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.update_time
*
* @param updateTime the value for jsh_orga_user_rel.update_time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.updater
*
* @return the value of jsh_orga_user_rel.updater
*
* @mbggenerated
*/
public Long getUpdater() {
return updater;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.updater
*
* @param updater the value for jsh_orga_user_rel.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) {
this.updater = updater;
}
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class OrgaUserRel {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.orga_id
*
* @mbggenerated
*/
private Long orgaId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.user_id
*
* @mbggenerated
*/
private Long userId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @mbggenerated
*/
private String userBlngOrgaDsplSeq;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.delete_flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.create_time
*
* @mbggenerated
*/
private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.creator
*
* @mbggenerated
*/
private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.update_time
*
* @mbggenerated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.updater
*
* @mbggenerated
*/
private Long updater;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_orga_user_rel.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.id
*
* @return the value of jsh_orga_user_rel.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.id
*
* @param id the value for jsh_orga_user_rel.id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.orga_id
*
* @return the value of jsh_orga_user_rel.orga_id
*
* @mbggenerated
*/
public Long getOrgaId() {
return orgaId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.orga_id
*
* @param orgaId the value for jsh_orga_user_rel.orga_id
*
* @mbggenerated
*/
public void setOrgaId(Long orgaId) {
this.orgaId = orgaId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.user_id
*
* @return the value of jsh_orga_user_rel.user_id
*
* @mbggenerated
*/
public Long getUserId() {
return userId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.user_id
*
* @param userId the value for jsh_orga_user_rel.user_id
*
* @mbggenerated
*/
public void setUserId(Long userId) {
this.userId = userId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @return the value of jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @mbggenerated
*/
public String getUserBlngOrgaDsplSeq() {
return userBlngOrgaDsplSeq;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @param userBlngOrgaDsplSeq the value for jsh_orga_user_rel.user_blng_orga_dspl_seq
*
* @mbggenerated
*/
public void setUserBlngOrgaDsplSeq(String userBlngOrgaDsplSeq) {
this.userBlngOrgaDsplSeq = userBlngOrgaDsplSeq == null ? null : userBlngOrgaDsplSeq.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.delete_flag
*
* @return the value of jsh_orga_user_rel.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_orga_user_rel.delete_flag
*
* @param deleteFlag the value for jsh_orga_user_rel.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_orga_user_rel.create_time
*
* @return the value of jsh_orga_user_rel.create_time
*
* @mbggenerated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.create_time
*
* @param createTime the value for jsh_orga_user_rel.create_time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.creator
*
* @return the value of jsh_orga_user_rel.creator
*
* @mbggenerated
*/
public Long getCreator() {
return creator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.creator
*
* @param creator the value for jsh_orga_user_rel.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) {
this.creator = creator;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.update_time
*
* @return the value of jsh_orga_user_rel.update_time
*
* @mbggenerated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.update_time
*
* @param updateTime the value for jsh_orga_user_rel.update_time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.updater
*
* @return the value of jsh_orga_user_rel.updater
*
* @mbggenerated
*/
public Long getUpdater() {
return updater;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.updater
*
* @param updater the value for jsh_orga_user_rel.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) {
this.updater = updater;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_orga_user_rel.tenant_id
*
* @return the value of jsh_orga_user_rel.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_orga_user_rel.tenant_id
*
* @param tenantId the value for jsh_orga_user_rel.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

1784
src/main/java/com/jsh/erp/datasource/entities/OrgaUserRelExample.java
View File

File diff suppressed because it is too large Load Diff

1000
src/main/java/com/jsh/erp/datasource/entities/Organization.java
View File

File diff suppressed because it is too large Load Diff

2624
src/main/java/com/jsh/erp/datasource/entities/OrganizationExample.java
View File

File diff suppressed because it is too large Load Diff

32
src/main/java/com/jsh/erp/datasource/entities/Person.java
View File

@@ -25,6 +25,14 @@ public class Person {
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_person.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_person.Id
@@ -96,4 +104,28 @@ public class Person {
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_person.tenant_id
*
* @return the value of jsh_person.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_person.tenant_id
*
* @param tenantId the value for jsh_person.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/PersonExample.java
View File

@@ -393,6 +393,66 @@ public class PersonExample {
addCriterion("Name not between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

32
src/main/java/com/jsh/erp/datasource/entities/Role.java
View File

@@ -41,6 +41,14 @@ public class Role {
*/
private String description;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_role.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.Id
@@ -160,4 +168,28 @@ public class Role {
public void setDescription(String description) {
this.description = description == null ? null : description.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.tenant_id
*
* @return the value of jsh_role.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_role.tenant_id
*
* @param tenantId the value for jsh_role.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/RoleExample.java
View File

@@ -533,6 +533,66 @@ public class RoleExample {
addCriterion("description not between", value1, value2, "description");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

725
src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
View File

@@ -1,338 +1,389 @@
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class SerialNumber {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.material_Id
*
* @mbggenerated
*/
private Long materialId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.serial_Number
*
* @mbggenerated
*/
private String serialNumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.is_Sell
*
* @mbggenerated
*/
private String isSell;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.create_Time
*
* @mbggenerated
*/
private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.creator
*
* @mbggenerated
*/
private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.update_Time
*
* @mbggenerated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.updater
*
* @mbggenerated
*/
private Long updater;
/**
* 单据主表id，用于跟踪序列号流向
* */
private Long depotheadId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.id
*
* @return the value of jsh_serial_number.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.id
*
* @param id the value for jsh_serial_number.id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.material_Id
*
* @return the value of jsh_serial_number.material_Id
*
* @mbggenerated
*/
public Long getMaterialId() {
return materialId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.material_Id
*
* @param materialId the value for jsh_serial_number.material_Id
*
* @mbggenerated
*/
public void setMaterialId(Long materialId) {
this.materialId = materialId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.serial_Number
*
* @return the value of jsh_serial_number.serial_Number
*
* @mbggenerated
*/
public String getSerialNumber() {
return serialNumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.serial_Number
*
* @param serialNumber the value for jsh_serial_number.serial_Number
*
* @mbggenerated
*/
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber == null ? null : serialNumber.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.is_Sell
*
* @return the value of jsh_serial_number.is_Sell
*
* @mbggenerated
*/
public String getIsSell() {
return isSell;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.is_Sell
*
* @param isSell the value for jsh_serial_number.is_Sell
*
* @mbggenerated
*/
public void setIsSell(String isSell) {
this.isSell = isSell;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.remark
*
* @return the value of jsh_serial_number.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.remark
*
* @param remark the value for jsh_serial_number.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.delete_Flag
*
* @return the value of jsh_serial_number.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_serial_number.delete_Flag
*
* @param deleteFlag the value for jsh_serial_number.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.create_Time
*
* @return the value of jsh_serial_number.create_Time
*
* @mbggenerated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.create_Time
*
* @param createTime the value for jsh_serial_number.create_Time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.creator
*
* @return the value of jsh_serial_number.creator
*
* @mbggenerated
*/
public Long getCreator() {
return creator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.creator
*
* @param creator the value for jsh_serial_number.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) {
this.creator = creator;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.update_Time
*
* @return the value of jsh_serial_number.update_Time
*
* @mbggenerated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.update_Time
*
* @param updateTime the value for jsh_serial_number.update_Time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.updater
*
* @return the value of jsh_serial_number.updater
*
* @mbggenerated
*/
public Long getUpdater() {
return updater;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.updater
*
* @param updater the value for jsh_serial_number.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) {
this.updater = updater;
}
public Long getDepotheadId() {
return depotheadId;
}
public void setDepotheadId(Long depotheadId) {
this.depotheadId = depotheadId;
}
package com.jsh.erp.datasource.entities;
import java.util.Date;
public class SerialNumber {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.material_Id
*
* @mbggenerated
*/
private Long materialId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.serial_Number
*
* @mbggenerated
*/
private String serialNumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.is_Sell
*
* @mbggenerated
*/
private String isSell;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.create_Time
*
* @mbggenerated
*/
private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.creator
*
* @mbggenerated
*/
private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.update_Time
*
* @mbggenerated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.updater
*
* @mbggenerated
*/
private Long updater;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.depothead_Id
*
* @mbggenerated
*/
private Long depotheadId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.id
*
* @return the value of jsh_serial_number.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.id
*
* @param id the value for jsh_serial_number.id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.material_Id
*
* @return the value of jsh_serial_number.material_Id
*
* @mbggenerated
*/
public Long getMaterialId() {
return materialId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.material_Id
*
* @param materialId the value for jsh_serial_number.material_Id
*
* @mbggenerated
*/
public void setMaterialId(Long materialId) {
this.materialId = materialId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.serial_Number
*
* @return the value of jsh_serial_number.serial_Number
*
* @mbggenerated
*/
public String getSerialNumber() {
return serialNumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.serial_Number
*
* @param serialNumber the value for jsh_serial_number.serial_Number
*
* @mbggenerated
*/
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber == null ? null : serialNumber.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.is_Sell
*
* @return the value of jsh_serial_number.is_Sell
*
* @mbggenerated
*/
public String getIsSell() {
return isSell;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.is_Sell
*
* @param isSell the value for jsh_serial_number.is_Sell
*
* @mbggenerated
*/
public void setIsSell(String isSell) {
this.isSell = isSell == null ? null : isSell.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.remark
*
* @return the value of jsh_serial_number.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.remark
*
* @param remark the value for jsh_serial_number.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.delete_Flag
*
* @return the value of jsh_serial_number.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_serial_number.delete_Flag
*
* @param deleteFlag the value for jsh_serial_number.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_serial_number.create_Time
*
* @return the value of jsh_serial_number.create_Time
*
* @mbggenerated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.create_Time
*
* @param createTime the value for jsh_serial_number.create_Time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.creator
*
* @return the value of jsh_serial_number.creator
*
* @mbggenerated
*/
public Long getCreator() {
return creator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.creator
*
* @param creator the value for jsh_serial_number.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) {
this.creator = creator;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.update_Time
*
* @return the value of jsh_serial_number.update_Time
*
* @mbggenerated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.update_Time
*
* @param updateTime the value for jsh_serial_number.update_Time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.updater
*
* @return the value of jsh_serial_number.updater
*
* @mbggenerated
*/
public Long getUpdater() {
return updater;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.updater
*
* @param updater the value for jsh_serial_number.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) {
this.updater = updater;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.depothead_Id
*
* @return the value of jsh_serial_number.depothead_Id
*
* @mbggenerated
*/
public Long getDepotheadId() {
return depotheadId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.depothead_Id
*
* @param depotheadId the value for jsh_serial_number.depothead_Id
*
* @mbggenerated
*/
public void setDepotheadId(Long depotheadId) {
this.depotheadId = depotheadId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.tenant_id
*
* @return the value of jsh_serial_number.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.tenant_id
*
* @param tenantId the value for jsh_serial_number.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

2062
src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
View File

File diff suppressed because it is too large Load Diff

1384
src/main/java/com/jsh/erp/datasource/entities/Supplier.java
View File

File diff suppressed because it is too large Load Diff

3424
src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java
View File

File diff suppressed because it is too large Load Diff

32
src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
View File

@@ -57,6 +57,14 @@ public class SystemConfig {
*/
private String companyPostCode;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.id
@@ -224,4 +232,28 @@ public class SystemConfig {
public void setCompanyPostCode(String companyPostCode) {
this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.tenant_id
*
* @return the value of jsh_systemconfig.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.tenant_id
*
* @param tenantId the value for jsh_systemconfig.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java
View File

@@ -673,6 +673,66 @@ public class SystemConfigExample {
addCriterion("company_post_code not between", value1, value2, "companyPostCode");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

32
src/main/java/com/jsh/erp/datasource/entities/Unit.java
View File

@@ -17,6 +17,14 @@ public class Unit {
*/
private String uname;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_unit.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_unit.id
@@ -64,4 +72,28 @@ public class Unit {
public void setUname(String uname) {
this.uname = uname == null ? null : uname.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_unit.tenant_id
*
* @return the value of jsh_unit.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_unit.tenant_id
*
* @param tenantId the value for jsh_unit.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/UnitExample.java
View File

@@ -323,6 +323,66 @@ public class UnitExample {
addCriterion("UName not between", value1, value2, "uname");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

42
src/main/java/com/jsh/erp/datasource/entities/User.java
View File

@@ -83,7 +83,7 @@ public class User {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.status
* This field corresponds to the database column jsh_user.Status
*
* @mbggenerated
*/
@@ -105,6 +105,14 @@ public class User {
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.id
@@ -347,9 +355,9 @@ public class User {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.status
* This method returns the value of the database column jsh_user.Status
*
* @return the value of jsh_user.status
* @return the value of jsh_user.Status
*
* @mbggenerated
*/
@@ -359,9 +367,9 @@ public class User {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.status
* This method sets the value of the database column jsh_user.Status
*
* @param status the value for jsh_user.status
* @param status the value for jsh_user.Status
*
* @mbggenerated
*/
@@ -416,4 +424,28 @@ public class User {
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.tenant_id
*
* @return the value of jsh_user.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.tenant_id
*
* @param tenantId the value for jsh_user.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

84
src/main/java/com/jsh/erp/datasource/entities/UserExample.java
View File

@@ -865,62 +865,62 @@ public class UserExample {
}
public Criteria andStatusIsNull() {
addCriterion("status is null");
addCriterion("Status is null");
return (Criteria) this;
}
public Criteria andStatusIsNotNull() {
addCriterion("status is not null");
addCriterion("Status is not null");
return (Criteria) this;
}
public Criteria andStatusEqualTo(Byte value) {
addCriterion("status =", value, "status");
addCriterion("Status =", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotEqualTo(Byte value) {
addCriterion("status <>", value, "status");
addCriterion("Status <>", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThan(Byte value) {
addCriterion("status >", value, "status");
addCriterion("Status >", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("status >=", value, "status");
addCriterion("Status >=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThan(Byte value) {
addCriterion("status <", value, "status");
addCriterion("Status <", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThanOrEqualTo(Byte value) {
addCriterion("status <=", value, "status");
addCriterion("Status <=", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<Byte> values) {
addCriterion("status in", values, "status");
addCriterion("Status in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Byte> values) {
addCriterion("status not in", values, "status");
addCriterion("Status not in", values, "status");
return (Criteria) this;
}
public Criteria andStatusBetween(Byte value1, Byte value2) {
addCriterion("status between", value1, value2, "status");
addCriterion("Status between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andStatusNotBetween(Byte value1, Byte value2) {
addCriterion("status not between", value1, value2, "status");
addCriterion("Status not between", value1, value2, "status");
return (Criteria) this;
}
@@ -1063,6 +1063,66 @@ public class UserExample {
addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;
}
public Criteria andTenantIdIsNotNull() {
addCriterion("tenant_id is not null");
return (Criteria) this;
}
public Criteria andTenantIdEqualTo(Long value) {
addCriterion("tenant_id =", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotEqualTo(Long value) {
addCriterion("tenant_id <>", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThan(Long value) {
addCriterion("tenant_id >", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
addCriterion("tenant_id >=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThan(Long value) {
addCriterion("tenant_id <", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdLessThanOrEqualTo(Long value) {
addCriterion("tenant_id <=", value, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdIn(List<Long> values) {
addCriterion("tenant_id in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotIn(List<Long> values) {
addCriterion("tenant_id not in", values, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdBetween(Long value1, Long value2) {
addCriterion("tenant_id between", value1, value2, "tenantId");
return (Criteria) this;
}
public Criteria andTenantIdNotBetween(Long value1, Long value2) {
addCriterion("tenant_id not between", value1, value2, "tenantId");
return (Criteria) this;
}
}
/**

194
src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java
View File

@@ -1,100 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.AccountHead;
import com.jsh.erp.datasource.entities.AccountHeadExample;
import java.math.BigDecimal;
import java.util.List;
import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
import org.apache.ibatis.annotations.Param;
public interface AccountHeadMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int countByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insert(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insertSelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
List<AccountHead> selectByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
AccountHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExample(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKey(AccountHead record);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.AccountHead;
import com.jsh.erp.datasource.entities.AccountHeadExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface AccountHeadMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int countByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insert(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insertSelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
List<AccountHead> selectByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
AccountHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExample(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKey(AccountHead record);
}

2
src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java
View File

@@ -3,8 +3,6 @@ package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.AccountItem;
import com.jsh.erp.datasource.entities.AccountItemExample;
import java.util.List;
import com.jsh.erp.datasource.vo.AccountItemVo4List;
import org.apache.ibatis.annotations.Param;
public interface AccountItemMapper {

3
src/main/java/com/jsh/erp/datasource/mappers/AccountMapper.java
View File

@@ -3,9 +3,6 @@ package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Account;
import com.jsh.erp.datasource.entities.AccountExample;
import java.util.List;
import com.jsh.erp.datasource.vo.AccountVo4InOutList;
import com.jsh.erp.datasource.vo.AccountVo4List;
import org.apache.ibatis.annotations.Param;
public interface AccountMapper {

1
src/main/java/com/jsh/erp/datasource/mappers/AppMapper.java
View File

@@ -93,5 +93,4 @@ public interface AppMapper {
* @mbggenerated
*/
int updateByPrimaryKey(App record);
}

192
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
View File

@@ -1,98 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.*;
import java.math.BigDecimal;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DepotItemMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int countByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insert(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insertSelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
List<DepotItem> selectByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
DepotItem selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExample(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotItem record);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotItem;
import com.jsh.erp.datasource.entities.DepotItemExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DepotItemMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int countByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insert(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insertSelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
List<DepotItem> selectByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
DepotItem selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExample(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotItem record);
}

2
src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java
View File

@@ -3,8 +3,6 @@ package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Log;
import com.jsh.erp.datasource.entities.LogExample;
import java.util.List;
import com.jsh.erp.datasource.vo.LogVo4List;
import org.apache.ibatis.annotations.Param;
public interface LogMapper {

190
src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapper.java
View File

@@ -1,96 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.MaterialCategory;
import com.jsh.erp.datasource.entities.MaterialCategoryExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface MaterialCategoryMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int countByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int deleteByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int insert(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int insertSelective(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
List<MaterialCategory> selectByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
MaterialCategory selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByPrimaryKey(MaterialCategory record);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.MaterialCategory;
import com.jsh.erp.datasource.entities.MaterialCategoryExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface MaterialCategoryMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int countByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int deleteByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int insert(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int insertSelective(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
List<MaterialCategory> selectByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
MaterialCategory selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByPrimaryKey(MaterialCategory record);
}

194
src/main/java/com/jsh/erp/datasource/mappers/MaterialMapper.java
View File

@@ -1,100 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Material;
import com.jsh.erp.datasource.entities.MaterialExample;
import java.util.List;
import com.jsh.erp.datasource.entities.MaterialVo4Unit;
import org.apache.ibatis.annotations.Param;
public interface MaterialMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int countByExample(MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int deleteByExample(MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int insert(Material record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int insertSelective(Material record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
List<Material> selectByExample(MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
Material selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Material record, @Param("example") MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int updateByExample(@Param("record") Material record, @Param("example") MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Material record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int updateByPrimaryKey(Material record);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Material;
import com.jsh.erp.datasource.entities.MaterialExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface MaterialMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int countByExample(MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int deleteByExample(MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int insert(Material record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int insertSelective(Material record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
List<Material> selectByExample(MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
Material selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Material record, @Param("example") MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int updateByExample(@Param("record") Material record, @Param("example") MaterialExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Material record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
int updateByPrimaryKey(Material record);
}

190
src/main/java/com/jsh/erp/datasource/mappers/OrgaUserRelMapper.java
View File

@@ -1,96 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.OrgaUserRel;
import com.jsh.erp.datasource.entities.OrgaUserRelExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface OrgaUserRelMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int countByExample(OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int deleteByExample(OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int insert(OrgaUserRel record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int insertSelective(OrgaUserRel record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
List<OrgaUserRel> selectByExample(OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
OrgaUserRel selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int updateByExample(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(OrgaUserRel record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int updateByPrimaryKey(OrgaUserRel record);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.OrgaUserRel;
import com.jsh.erp.datasource.entities.OrgaUserRelExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface OrgaUserRelMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int countByExample(OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int deleteByExample(OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int insert(OrgaUserRel record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int insertSelective(OrgaUserRel record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
List<OrgaUserRel> selectByExample(OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
OrgaUserRel selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int updateByExample(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(OrgaUserRel record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_orga_user_rel
*
* @mbggenerated
*/
int updateByPrimaryKey(OrgaUserRel record);
}

190
src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapper.java
View File

@@ -1,96 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Organization;
import com.jsh.erp.datasource.entities.OrganizationExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface OrganizationMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int countByExample(OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int deleteByExample(OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int insert(Organization record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int insertSelective(Organization record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
List<Organization> selectByExample(OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
Organization selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Organization record, @Param("example") OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int updateByExample(@Param("record") Organization record, @Param("example") OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Organization record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int updateByPrimaryKey(Organization record);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Organization;
import com.jsh.erp.datasource.entities.OrganizationExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface OrganizationMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int countByExample(OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int deleteByExample(OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int insert(Organization record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int insertSelective(Organization record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
List<Organization> selectByExample(OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
Organization selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Organization record, @Param("example") OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int updateByExample(@Param("record") Organization record, @Param("example") OrganizationExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Organization record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_organization
*
* @mbggenerated
*/
int updateByPrimaryKey(Organization record);
}

191
src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapper.java
View File

@@ -1,97 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.SerialNumber;
import com.jsh.erp.datasource.entities.SerialNumberExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface SerialNumberMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int countByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int deleteByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int insert(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int insertSelective(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
List<SerialNumber> selectByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
SerialNumber selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByExample(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByPrimaryKey(SerialNumber record);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.SerialNumber;
import com.jsh.erp.datasource.entities.SerialNumberExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface SerialNumberMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int countByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int deleteByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int insert(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int insertSelective(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
List<SerialNumber> selectByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
SerialNumber selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByExample(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByPrimaryKey(SerialNumber record);
}

190
src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java
View File

@@ -1,96 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Supplier;
import com.jsh.erp.datasource.entities.SupplierExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface SupplierMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int countByExample(SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int deleteByExample(SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int insert(Supplier record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int insertSelective(Supplier record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
List<Supplier> selectByExample(SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
Supplier selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Supplier record, @Param("example") SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int updateByExample(@Param("record") Supplier record, @Param("example") SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Supplier record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int updateByPrimaryKey(Supplier record);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Supplier;
import com.jsh.erp.datasource.entities.SupplierExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface SupplierMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int countByExample(SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int deleteByExample(SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int insert(Supplier record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int insertSelective(Supplier record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
List<Supplier> selectByExample(SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
Supplier selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Supplier record, @Param("example") SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int updateByExample(@Param("record") Supplier record, @Param("example") SupplierExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Supplier record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_supplier
*
* @mbggenerated
*/
int updateByPrimaryKey(Supplier record);
}

64
src/main/java/com/jsh/erp/datasource/vo/AccountItemVo4List.java
View File

@@ -1,73 +1,13 @@
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
import com.jsh.erp.datasource.entities.AccountItem;
public class AccountItemVo4List {
private Long id;
private Long headerid;
private Long accountid;
private Long inoutitemid;
private BigDecimal eachamount;
private String remark;
public class AccountItemVo4List extends AccountItem {
private String accountName;
private String inOutItemName;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getHeaderid() {
return headerid;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
public Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public Long getInoutitemid() {
return inoutitemid;
}
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
}
public BigDecimal getEachamount() {
return eachamount;
}
public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getAccountName() {
return accountName;
}

10
src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java
View File

@@ -20,6 +20,8 @@ public class AccountVo4InOutList {
private String amList;
private Long tenantId;
public String getNumber() {
return number;
}
@@ -83,4 +85,12 @@ public class AccountVo4InOutList {
public void setAmList(String amList) {
this.amList = amList;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

74
src/main/java/com/jsh/erp/datasource/vo/AccountVo4List.java
View File

@@ -1,81 +1,11 @@
package com.jsh.erp.datasource.vo;
import java.math.BigDecimal;
import com.jsh.erp.datasource.entities.Account;
public class AccountVo4List {
private Long id;
private String name;
private String serialno;
private BigDecimal initialamount;
private BigDecimal currentamount;
private String remark;
private Boolean isdefault;
public class AccountVo4List extends Account{
private String thismonthamount;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSerialno() {
return serialno;
}
public void setSerialno(String serialno) {
this.serialno = serialno;
}
public BigDecimal getInitialamount() {
return initialamount;
}
public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount;
}
public BigDecimal getCurrentamount() {
return currentamount;
}
public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Boolean getIsdefault() {
return isdefault;
}
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
public String getThismonthamount() {
return thismonthamount;
}

10
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java
View File

@@ -26,6 +26,8 @@ public class DepotHeadVo4InDetail {
private String NewType;
private Long tenantId;
public String getNumber() {
return Number;
}
@@ -105,4 +107,12 @@ public class DepotHeadVo4InDetail {
public void setNewType(String newType) {
NewType = newType;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

10
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java
View File

@@ -17,6 +17,8 @@ public class DepotHeadVo4InOutMCount {
private BigDecimal priceSum;
private Long tenantId;
public Long getMaterialId() {
return MaterialId;
}
@@ -64,4 +66,12 @@ public class DepotHeadVo4InOutMCount {
public void setPriceSum(BigDecimal priceSum) {
this.priceSum = priceSum;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

294
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View File

@@ -1,67 +1,11 @@
package com.jsh.erp.datasource.vo;
import com.jsh.erp.datasource.entities.DepotHead;
import java.math.BigDecimal;
import java.util.Date;
public class DepotHeadVo4List {
private Long id;
private String type;
private String subtype;
private Long projectid;
private String defaultnumber;
private String number;
private String operpersonname;
private Date createtime;
private Date opertime;
private Long organid;
private Long handspersonid;
private Long accountid;
private BigDecimal changeamount;
private Long allocationprojectid;
private BigDecimal totalprice;
private String paytype;
private String remark;
private String salesman;
private String accountidlist;
private String accountmoneylist;
private BigDecimal discount;
private BigDecimal discountmoney;
private BigDecimal discountlastmoney;
private BigDecimal othermoney;
private String othermoneylist;
private String othermoneyitem;
private Integer accountday;
private String status;
private String linknumber;
public class DepotHeadVo4List extends DepotHead{
private String projectName;
@@ -77,238 +21,6 @@ public class DepotHeadVo4List {
private String opertimeStr;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getSubtype() {
return subtype;
}
public void setSubtype(String subtype) {
this.subtype = subtype;
}
public Long getProjectid() {
return projectid;
}
public void setProjectid(Long projectid) {
this.projectid = projectid;
}
public String getDefaultnumber() {
return defaultnumber;
}
public void setDefaultnumber(String defaultnumber) {
this.defaultnumber = defaultnumber;
}
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getOperpersonname() {
return operpersonname;
}
public void setOperpersonname(String operpersonname) {
this.operpersonname = operpersonname;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public Date getOpertime() {
return opertime;
}
public void setOpertime(Date opertime) {
this.opertime = opertime;
}
public Long getOrganid() {
return organid;
}
public void setOrganid(Long organid) {
this.organid = organid;
}
public Long getHandspersonid() {
return handspersonid;
}
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
}
public Long getAccountid() {
return accountid;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
}
public BigDecimal getChangeamount() {
return changeamount;
}
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
}
public Long getAllocationprojectid() {
return allocationprojectid;
}
public void setAllocationprojectid(Long allocationprojectid) {
this.allocationprojectid = allocationprojectid;
}
public BigDecimal getTotalprice() {
return totalprice;
}
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
}
public String getPaytype() {
return paytype;
}
public void setPaytype(String paytype) {
this.paytype = paytype;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getSalesman() {
return salesman;
}
public void setSalesman(String salesman) {
this.salesman = salesman;
}
public String getAccountidlist() {
return accountidlist;
}
public void setAccountidlist(String accountidlist) {
this.accountidlist = accountidlist;
}
public String getAccountmoneylist() {
return accountmoneylist;
}
public void setAccountmoneylist(String accountmoneylist) {
this.accountmoneylist = accountmoneylist;
}
public BigDecimal getDiscount() {
return discount;
}
public void setDiscount(BigDecimal discount) {
this.discount = discount;
}
public BigDecimal getDiscountmoney() {
return discountmoney;
}
public void setDiscountmoney(BigDecimal discountmoney) {
this.discountmoney = discountmoney;
}
public BigDecimal getDiscountlastmoney() {
return discountlastmoney;
}
public void setDiscountlastmoney(BigDecimal discountlastmoney) {
this.discountlastmoney = discountlastmoney;
}
public BigDecimal getOthermoney() {
return othermoney;
}
public void setOthermoney(BigDecimal othermoney) {
this.othermoney = othermoney;
}
public String getOthermoneylist() {
return othermoneylist;
}
public void setOthermoneylist(String othermoneylist) {
this.othermoneylist = othermoneylist;
}
public String getOthermoneyitem() {
return othermoneyitem;
}
public void setOthermoneyitem(String othermoneyitem) {
this.othermoneyitem = othermoneyitem;
}
public Integer getAccountday() {
return accountday;
}
public void setAccountday(Integer accountday) {
this.accountday = accountday;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getLinknumber() {
return linknumber;
}
public void setLinknumber(String linknumber) {
this.linknumber = linknumber;
}
public String getProjectName() {
return projectName;
}

10
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4StatementAccount.java
View File

@@ -19,6 +19,8 @@ public class DepotHeadVo4StatementAccount {
private String oTime;
private Long tenantId;
public String getNumber() {
return number;
}
@@ -74,4 +76,12 @@ public class DepotHeadVo4StatementAccount {
public void setoTime(String oTime) {
this.oTime = oTime;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
}

84
src/main/java/com/jsh/erp/datasource/vo/LogVo4List.java
View File

@@ -1,91 +1,11 @@
package com.jsh.erp.datasource.vo;
import java.util.Date;
import com.jsh.erp.datasource.entities.Log;
public class LogVo4List {
private Long id;
private Long userid;
private String operation;
private String clientip;
private Date createtime;
private Byte status;
private String contentdetails;
private String remark;
public class LogVo4List extends Log {
private String username;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getUserid() {
return userid;
}
public void setUserid(Long userid) {
this.userid = userid;
}
public String getOperation() {
return operation;
}
public void setOperation(String operation) {
this.operation = operation;
}
public String getClientip() {
return clientip;
}
public void setClientip(String clientip) {
this.clientip = clientip;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public Byte getStatus() {
return status;
}
public void setStatus(Byte status) {
this.status = status;
}
public String getContentdetails() {
return contentdetails;
}
public void setContentdetails(String contentdetails) {
this.contentdetails = contentdetails;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getUsername() {
return username;
}

8
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -255,7 +255,7 @@ public class DepotItemService {
if(material==null){
continue;
}
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())){
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())){
serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),depotItem.getBasicnumber().intValue(),
new Date(),userInfo==null?null:userInfo.getId());
}
@@ -364,7 +364,7 @@ public class DepotItemService {
/**
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
* */
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
//查询单据子表中开启序列号的数据列表
serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo);
}
@@ -391,7 +391,7 @@ public class DepotItemService {
/**
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
* */
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(), depotItem.getBasicnumber().intValue(),
new Date(), userInfo == null ? null : userInfo.getId());
}
@@ -471,7 +471,7 @@ public class DepotItemService {
/**
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
* */
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
//查询单据子表中开启序列号的数据列表
serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo);
}

2
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
View File

@@ -229,7 +229,7 @@ public class SerialNumberService {
}
//获得唯一商品
if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableSerialNumber())) {
if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableserialnumber())) {
//商品未开启序列号
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_CODE,
ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_MSG);