Skip to content
GitLab
Commit 2f77dfbf authored by qiankunpingtai's avatar qiankunpingtai
Browse files

从源更新

parents 331ca3e3 0e46a9f2
Expand all Hide whitespace changes
Inline Side-by-side
pom.xml
View file @ 2f77dfbf
......@@ -110,65 +110,50 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<build>
<finalName>jshERP2.0</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.0.3.RELEASE</version>
<executions>
<execution>
<id>build-info</id>
<phase>generate-sources</phase>
<goals>
<goal>build-info</goal>
</goals>
</execution>
<execution>
<id>repackage</id>
<phase>package</phase>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>com.jsh.erp.ErpApplication</mainClass>
<layout>JAR</layout>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<version>2.5.1</version>
<executions>
<execution>
<id>make-assembly</id>
<id>make-zip</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<skipAssembly>false</skipAssembly>
<outputDirectory>./bin</outputDirectory>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
<outputDirectory>./dist</outputDirectory>
</configuration>
</execution>
</executions>
......
src/main/assembly/assembly.xml 0 → 100644
View file @ 2f77dfbf
<?xml version="1.0" encoding="UTF-8" ?>
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 ">
<id>bin</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>erp_web</directory>
<outputDirectory>/erp_web</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/target</directory>
<includes>
<include>*.jar</include>
</includes>
<outputDirectory>/lib</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>*.properties</include>
<include>*.yml</include>
<include>*.yaml</include>
<include>*.xml</include>
</includes>
<outputDirectory>/config</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/bin</directory>
<outputDirectory>/bin</outputDirectory>
<includes>
<include>run-manage.sh</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/bin/</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>start.bat</include>
<include>restart.sh</include>
<include>start.sh</include>
<include>stop.sh</include>
<include>status.sh</include>
</includes>
</fileSet>
<fileSet>
<directory>docs</directory>
<outputDirectory>/docs</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}</directory>
<includes>
<include>*.md</include>
<include>*.txt</include>
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
src/main/assembly/package.xml deleted 100644 → 0
View file @ 331ca3e3
<?xml version="1.0" encoding="UTF-8" ?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 ">
<id>package</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<moduleSets>
<moduleSet>
<includes>
</includes>
</moduleSet>
</moduleSets>
<fileSets>
<fileSet>
<directory>src/main/conf</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
<directory>erp_web</directory>
<outputDirectory>/erp_web</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
<source>src/main/resources/application.properties</source>
<outputDirectory>/conf</outputDirectory>
</file>
<file>
<source>src/main/resources/logback-spring.xml</source>
<outputDirectory>/conf</outputDirectory>
</file>
</files>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
src/main/bin/restart.sh 0 → 100644
View file @ 2f77dfbf
./bin/run-manage.sh restart
\ No newline at end of file
src/main/bin/run-manage.sh 0 → 100644
View file @ 2f77dfbf
FILE_PATH=/home/jshERP2.0
SERVER_NAME=jshERP
readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))}
#readonly JAVA_HOME=""
readonly CONFIG_HOME="$APP_HOME/config/"
readonly LIB_HOME="$APP_HOME/lib"
readonly LOGS_HOME="$APP_HOME/logs"
readonly PID_FILE="$LOGS_HOME/application.pid"
readonly APP_MAIN_CLASS="jshERP2.0.jar"
readonly LOG_CONFIG="$CONFIG_HOME/logback-spring.xml"
readonly JAVA_RUN="-Dlogs.home=$LOGS_HOME -Dlogging.config=$LOG_CONFIG -Dspring.config.location=file:$CONFIG_HOME -Dspring.pid.file=$PID_FILE -Dspring.pid.fail-on-write-error=true"
readonly JAVA_OPTS="-server -Xms128m -Xmx320m -XX:PermSize=128M -XX:MaxPermSize=256M $JAVA_RUN"
readonly JAVA="java"
PID=0
if [ ! -x "$LOGS_HOME" ]
then
mkdir $LOGS_HOME
fi
chmod +x -R "$JAVA_HOME/bin/"
functions="/etc/functions.sh"
if test -f $functions ; then
. $functions
else
success()
{
echo " SUCCESS! $@"
}
failure()
{
echo " ERROR! $@"
}
warning()
{
echo "WARNING! $@"
}
fi
function install(){
if [[ ! -n $FILE_PATH ]];then
sed -i "s#FILE_PATH=/home/jshERP2.0#FILE_PATH=$APP_HOME#" $APP_HOME/$0
if [[ -e /usr/sbin/$SERVER_NAME || -L /usr/sbin/$SERVER_NAME ]];then
rm -rf /usr/sbin/$SERVER_NAME && ln -s $APP_HOME/$0 /usr/sbin/$SERVER_NAME
fi
fi
}
function checkpid() {
PID=$(ps -ef | grep $APP_MAIN_CLASS | grep -v 'grep' | awk '{print int($2)}')
if [[ -n "$PID" ]]
then
return 0
else
return 1
fi
}
function start() {
checkpid
if [[ $? -eq 0 ]]
then
warning "[$APP_MAIN_CLASS]: already started! (PID=$PID)"
else
echo -n "[$APP_MAIN_CLASS]: Starting ..."
JAVA_CMD="nohup $JAVA $JAVA_OPTS -jar $LIB_HOME/$APP_MAIN_CLASS > /dev/null 2>&1 &"
# echo "Exec cmmand : $JAVA_CMD"
sh -c "$JAVA_CMD"
sleep 3
checkpid
if [[ $? -eq 0 ]]
then
success "(PID=$PID) "
else
failure " "
fi
fi
}
function stop() {
checkpid
if [[ $? -eq 0 ]];
then
echo -n "[$APP_MAIN_CLASS]: Shutting down ...(PID=$PID) "
kill -9 $PID
if [[ $? -eq 0 ]];
then
echo 0 > $PID_FILE
success " "
else
failure " "
fi
else
warning "[$APP_MAIN_CLASS]: is not running ..."
fi
}
function status() {
checkpid
if [[ $? -eq 0 ]]
then
success "[$APP_MAIN_CLASS]: is running! (PID=$PID)"
return 0
else
failure "[$APP_MAIN_CLASS]: is not running"
return 1
fi
}
function info() {
echo "System Information:"
echo
echo "****************************"
echo `head -n 1 /etc/issue`
echo `uname -a`
echo
echo "JAVA_HOME=$JAVA_HOME"
echo
echo "JAVA Environment Information:"
echo `$JAVA -version`
echo
echo "APP_HOME=$APP_HOME"
echo "APP_MAIN_CLASS=$APP_MAIN_CLASS"
echo
echo "****************************"
}
case "$1" in
'start')
start
;;
'stop')
stop
;;
'restart')
stop
start
;;
'status')
status
;;
'info')
info
;;
'install')
install
;;
*)
echo "Usage: $0 {help|start|stop|restart|status|info|install}"
;;
esac
exit 0
src/main/bin/start.bat 0 → 100644
View file @ 2f77dfbf
@echo off
title jshERP
java -Xms1000m -Xmx2000m -jar .\lib\jshERP2.0.jar
pause over
\ No newline at end of file
src/main/bin/start.sh 0 → 100644
View file @ 2f77dfbf
./bin/run-manage.sh start
\ No newline at end of file
src/main/bin/status.sh 0 → 100644
View file @ 2f77dfbf
./bin/run-manage.sh status
\ No newline at end of file
src/main/bin/stop.sh 0 → 100644
View file @ 2f77dfbf
./bin/run-manage.sh stop
\ No newline at end of file
src/main/conf/start.bat deleted 100644 → 0
View file @ 331ca3e3
@echo off
title jshERP
java -Xms1000m -Xmx2000m -cp .\conf;.\lib\*; -XX:+CreateMinidumpOnCrash com.jsh.erp.ErpApplication
pause over
\ No newline at end of file
src/main/conf/start.sh deleted 100644 → 0
View file @ 331ca3e3
nohup java -XX:+CreateMinidumpOnCrash -cp ./conf:./lib/*: com.jsh.erp.ErpApplication > /dev/null 2>&1 &
\ No newline at end of file
src/main/java/com/jsh/erp/controller/AccountHeadController.java
View file @ 2f77dfbf
......@@ -53,19 +53,7 @@ public class AccountHeadController {
Map<String, Object> map = new HashMap<String, Object>();
try {
JSONObject outer = new JSONObject();
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
int i = 1;
if (supType.equals("customer")) { //客户
i = 1;
} else if (supType.equals("vendor")) { //供应商
i = -1;
}
//收付款部分
sum = sum.add((allMoney(getS, "付款", "合计",endTime).add(allMoney(getS, "付款", "实际",endTime))).multiply(new BigDecimal(i)));
sum = sum.subtract((allMoney(getS, "收款", "合计",endTime).add(allMoney(getS, "收款", "实际",endTime))).multiply(new BigDecimal(i)));
sum = sum.add((allMoney(getS, "收入", "合计",endTime).subtract(allMoney(getS, "收入", "实际",endTime))).multiply(new BigDecimal(i)));
sum = sum.subtract((allMoney(getS, "支出", "合计",endTime).subtract(allMoney(getS, "支出", "实际",endTime))).multiply(new BigDecimal(i)));
BigDecimal sum = accountHeadService.findTotalPay(supplierId, endTime, supType);
outer.put("getAllMoney", sum);
map.put("rows", outer);
res.code = 200;
......@@ -104,31 +92,6 @@ public class AccountHeadController {
return res;
}
/**
* 统计总金额
* @param getS
* @param type
* @param mode 合计或者金额
* @param endTime
* @return
*/
public BigDecimal allMoney(String getS, String type, String mode, String endTime)throws Exception {
BigDecimal allMoney = BigDecimal.ZERO;
try {
Integer supplierId = Integer.valueOf(getS);
BigDecimal sum = accountHeadService.findAllMoney(supplierId, type, mode, endTime);
if(sum != null) {
allMoney = sum;
}
} catch (Exception e) {
e.printStackTrace();
}
//返回正数，如果负数也转为正数
if ((allMoney.compareTo(BigDecimal.ZERO))==-1) {
allMoney = allMoney.abs();
}
return allMoney;
}
/**
* create by: qiankunpingtai
* website：https://qiankunpingtai.cn
......
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View file @ 2f77dfbf
......@@ -322,19 +322,7 @@ public class DepotHeadController {
Map<String, Object> map = new HashMap<String, Object>();
try {
JSONObject outer = new JSONObject();
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
int i = 1;
if (supType.equals("customer")) { //客户
i = 1;
} else if (supType.equals("vendor")) { //供应商
i = -1;
}
//进销部分
sum = sum.subtract((allMoney(getS, "入库", "采购", "合计",endTime).subtract(allMoney(getS, "入库", "采购", "实际",endTime))).multiply(new BigDecimal(i)));
sum = sum.subtract((allMoney(getS, "入库", "销售退货", "合计",endTime).subtract(allMoney(getS, "入库", "销售退货", "实际",endTime))).multiply(new BigDecimal(i)));
sum = sum.add((allMoney(getS, "出库", "销售", "合计",endTime).subtract(allMoney(getS, "出库", "销售", "实际",endTime))).multiply(new BigDecimal(i)));
sum = sum.add((allMoney(getS, "出库", "采购退货", "合计",endTime).subtract(allMoney(getS, "出库", "采购退货", "实际",endTime))).multiply(new BigDecimal(i)));
BigDecimal sum = depotHeadService.findTotalPay(supplierId, endTime, supType);
outer.put("getAllMoney", sum);
map.put("rows", outer);
res.code = 200;
......@@ -373,32 +361,6 @@ public class DepotHeadController {
return res;
}
/**
* 统计总金额
* @param getS
* @param type
* @param subType
* @param mode 合计或者金额
* @return
*/
public BigDecimal allMoney(String getS, String type, String subType, String mode, String endTime)throws Exception {
BigDecimal allMoney = BigDecimal.ZERO;
try {
Integer supplierId = Integer.valueOf(getS);
BigDecimal sum = depotHeadService.findAllMoney(supplierId, type, subType, mode, endTime);
if(sum != null) {
allMoney = sum;
}
} catch (Exception e) {
e.printStackTrace();
}
//返回正数，如果负数也转为正数
if ((allMoney.compareTo(BigDecimal.ZERO))==-1) {
allMoney = allMoney.abs();
}
return allMoney;
}
/**
* create by: cjl
* description:
......
src/main/java/com/jsh/erp/controller/MaterialController.java
View file @ 2f77dfbf
......@@ -192,7 +192,6 @@ public class MaterialController {
* 生成excel表格
* @param name
* @param model
* @param categoryId
* @param categoryIds
* @param request
* @param response
......@@ -201,14 +200,13 @@ public class MaterialController {
@GetMapping(value = "/exportExcel")
public void exportExcel(@RequestParam("name") String name,
@RequestParam("model") String model,
@RequestParam("categoryId") Long categoryId,
@RequestParam("categoryIds") String categoryIds,
HttpServletRequest request, HttpServletResponse response)throws Exception {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
String message = "成功";
try {
List<MaterialVo4Unit> dataList = materialService.findByAll(name, model, categoryId, categoryIds);
List<MaterialVo4Unit> dataList = materialService.findByAll(name, model, categoryIds);
String[] names = {"品名", "类型", "型号", "安全存量", "单位", "零售价", "最低售价", "预计采购价", "批发价", "备注", "状态"};
String title = "商品信息";
List<String[]> objects = new ArrayList<String[]>();
......
src/main/java/com/jsh/erp/datasource/entities/Asset.java deleted 100644 → 0
View file @ 331ca3e3
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class Asset {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.assetnameID
*
* @mbggenerated
*/
private Long assetnameid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.location
*
* @mbggenerated
*/
private String location;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.labels
*
* @mbggenerated
*/
private String labels;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.status
*
* @mbggenerated
*/
private Short status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.userID
*
* @mbggenerated
*/
private Long userid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.price
*
* @mbggenerated
*/
private BigDecimal price;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.purchasedate
*
* @mbggenerated
*/
private Date purchasedate;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.periodofvalidity
*
* @mbggenerated
*/
private Date periodofvalidity;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.warrantydate
*
* @mbggenerated
*/
private Date warrantydate;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.assetnum
*
* @mbggenerated
*/
private String assetnum;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.serialnum
*
* @mbggenerated
*/
private String serialnum;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.supplier
*
* @mbggenerated
*/
private Long supplier;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.createtime
*
* @mbggenerated
*/
private Date createtime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.creator
*
* @mbggenerated
*/
private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.updatetime
*
* @mbggenerated
*/
private Date updatetime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.updator
*
* @mbggenerated
*/
private Long updator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.description
*
* @mbggenerated
*/
private String description;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_asset.addMonth
*
* @mbggenerated
*/
private String addmonth;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.id
*
* @return the value of jsh_asset.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.id
*
* @param id the value for jsh_asset.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_asset.assetnameID
*
* @return the value of jsh_asset.assetnameID
*
* @mbggenerated
*/
public Long getAssetnameid() {
return assetnameid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.assetnameID
*
* @param assetnameid the value for jsh_asset.assetnameID
*
* @mbggenerated
*/
public void setAssetnameid(Long assetnameid) {
this.assetnameid = assetnameid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.location
*
* @return the value of jsh_asset.location
*
* @mbggenerated
*/
public String getLocation() {
return location;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.location
*
* @param location the value for jsh_asset.location
*
* @mbggenerated
*/
public void setLocation(String location) {
this.location = location == null ? null : location.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.labels
*
* @return the value of jsh_asset.labels
*
* @mbggenerated
*/
public String getLabels() {
return labels;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.labels
*
* @param labels the value for jsh_asset.labels
*
* @mbggenerated
*/
public void setLabels(String labels) {
this.labels = labels == null ? null : labels.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.status
*
* @return the value of jsh_asset.status
*
* @mbggenerated
*/
public Short getStatus() {
return status;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.status
*
* @param status the value for jsh_asset.status
*
* @mbggenerated
*/
public void setStatus(Short status) {
this.status = status;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.userID
*
* @return the value of jsh_asset.userID
*
* @mbggenerated
*/
public Long getUserid() {
return userid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.userID
*
* @param userid the value for jsh_asset.userID
*
* @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_asset.price
*
* @return the value of jsh_asset.price
*
* @mbggenerated
*/
public BigDecimal getPrice() {
return price;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.price
*
* @param price the value for jsh_asset.price
*
* @mbggenerated
*/
public void setPrice(BigDecimal price) {
this.price = price;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.purchasedate
*
* @return the value of jsh_asset.purchasedate
*
* @mbggenerated
*/
public Date getPurchasedate() {
return purchasedate;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.purchasedate
*
* @param purchasedate the value for jsh_asset.purchasedate
*
* @mbggenerated
*/
public void setPurchasedate(Date purchasedate) {
this.purchasedate = purchasedate;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.periodofvalidity
*
* @return the value of jsh_asset.periodofvalidity
*
* @mbggenerated
*/
public Date getPeriodofvalidity() {
return periodofvalidity;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.periodofvalidity
*
* @param periodofvalidity the value for jsh_asset.periodofvalidity
*
* @mbggenerated
*/
public void setPeriodofvalidity(Date periodofvalidity) {
this.periodofvalidity = periodofvalidity;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.warrantydate
*
* @return the value of jsh_asset.warrantydate
*
* @mbggenerated
*/
public Date getWarrantydate() {
return warrantydate;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.warrantydate
*
* @param warrantydate the value for jsh_asset.warrantydate
*
* @mbggenerated
*/
public void setWarrantydate(Date warrantydate) {
this.warrantydate = warrantydate;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.assetnum
*
* @return the value of jsh_asset.assetnum
*
* @mbggenerated
*/
public String getAssetnum() {
return assetnum;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.assetnum
*
* @param assetnum the value for jsh_asset.assetnum
*
* @mbggenerated
*/
public void setAssetnum(String assetnum) {
this.assetnum = assetnum == null ? null : assetnum.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.serialnum
*
* @return the value of jsh_asset.serialnum
*
* @mbggenerated
*/
public String getSerialnum() {
return serialnum;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.serialnum
*
* @param serialnum the value for jsh_asset.serialnum
*
* @mbggenerated
*/
public void setSerialnum(String serialnum) {
this.serialnum = serialnum == null ? null : serialnum.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.supplier
*
* @return the value of jsh_asset.supplier
*
* @mbggenerated
*/
public Long getSupplier() {
return supplier;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.supplier
*
* @param supplier the value for jsh_asset.supplier
*
* @mbggenerated
*/
public void setSupplier(Long supplier) {
this.supplier = supplier;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.createtime
*
* @return the value of jsh_asset.createtime
*
* @mbggenerated
*/
public Date getCreatetime() {
return createtime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.createtime
*
* @param createtime the value for jsh_asset.createtime
*
* @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_asset.creator
*
* @return the value of jsh_asset.creator
*
* @mbggenerated
*/
public Long getCreator() {
return creator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.creator
*
* @param creator the value for jsh_asset.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_asset.updatetime
*
* @return the value of jsh_asset.updatetime
*
* @mbggenerated
*/
public Date getUpdatetime() {
return updatetime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.updatetime
*
* @param updatetime the value for jsh_asset.updatetime
*
* @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_asset.updator
*
* @return the value of jsh_asset.updator
*
* @mbggenerated
*/
public Long getUpdator() {
return updator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.updator
*
* @param updator the value for jsh_asset.updator
*
* @mbggenerated
*/
public void setUpdator(Long updator) {
this.updator = updator;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.tenant_id
*
* @return the value of jsh_asset.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_asset.tenant_id
*
* @param tenantId the value for jsh_asset.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_asset.delete_Flag
*
* @return the value of jsh_asset.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.delete_Flag
*
* @param deleteFlag the value for jsh_asset.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_asset.description
*
* @return the value of jsh_asset.description
*
* @mbggenerated
*/
public String getDescription() {
return description;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.description
*
* @param description the value for jsh_asset.description
*
* @mbggenerated
*/
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_asset.addMonth
*
* @return the value of jsh_asset.addMonth
*
* @mbggenerated
*/
public String getAddmonth() {
return addmonth;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_asset.addMonth
*
* @param addmonth the value for jsh_asset.addMonth
*
* @mbggenerated
*/
public void setAddmonth(String addmonth) {
this.addmonth = addmonth == null ? null : addmonth.trim();
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/AssetCategory.java deleted 100644 → 0
View file @ 331ca3e3
package com.jsh.erp.datasource.entities;
public class AssetCategory {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetcategory.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetcategory.assetname
*
* @mbggenerated
*/
private String assetname;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetcategory.isystem
*
* @mbggenerated
*/
private Byte isystem;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetcategory.description
*
* @mbggenerated
*/
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 field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetcategory.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetcategory.id
*
* @return the value of jsh_assetcategory.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetcategory.id
*
* @param id the value for jsh_assetcategory.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_assetcategory.assetname
*
* @return the value of jsh_assetcategory.assetname
*
* @mbggenerated
*/
public String getAssetname() {
return assetname;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetcategory.assetname
*
* @param assetname the value for jsh_assetcategory.assetname
*
* @mbggenerated
*/
public void setAssetname(String assetname) {
this.assetname = assetname == null ? null : assetname.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetcategory.isystem
*
* @return the value of jsh_assetcategory.isystem
*
* @mbggenerated
*/
public Byte getIsystem() {
return isystem;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetcategory.isystem
*
* @param isystem the value for jsh_assetcategory.isystem
*
* @mbggenerated
*/
public void setIsystem(Byte isystem) {
this.isystem = isystem;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetcategory.description
*
* @return the value of jsh_assetcategory.description
*
* @mbggenerated
*/
public String getDescription() {
return description;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetcategory.description
*
* @param description the value for jsh_assetcategory.description
*
* @mbggenerated
*/
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;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetcategory.delete_Flag
*
* @return the value of jsh_assetcategory.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetcategory.delete_Flag
*
* @param deleteFlag the value for jsh_assetcategory.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/AssetName.java deleted 100644 → 0
View file @ 331ca3e3
package com.jsh.erp.datasource.entities;
public class AssetName {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetname.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetname.assetname
*
* @mbggenerated
*/
private String assetname;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetname.assetcategoryID
*
* @mbggenerated
*/
private Long assetcategoryid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetname.isystem
*
* @mbggenerated
*/
private Short isystem;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetname.isconsumables
*
* @mbggenerated
*/
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.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_assetname.description
*
* @mbggenerated
*/
private String description;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetname.id
*
* @return the value of jsh_assetname.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetname.id
*
* @param id the value for jsh_assetname.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_assetname.assetname
*
* @return the value of jsh_assetname.assetname
*
* @mbggenerated
*/
public String getAssetname() {
return assetname;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetname.assetname
*
* @param assetname the value for jsh_assetname.assetname
*
* @mbggenerated
*/
public void setAssetname(String assetname) {
this.assetname = assetname == null ? null : assetname.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetname.assetcategoryID
*
* @return the value of jsh_assetname.assetcategoryID
*
* @mbggenerated
*/
public Long getAssetcategoryid() {
return assetcategoryid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetname.assetcategoryID
*
* @param assetcategoryid the value for jsh_assetname.assetcategoryID
*
* @mbggenerated
*/
public void setAssetcategoryid(Long assetcategoryid) {
this.assetcategoryid = assetcategoryid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetname.isystem
*
* @return the value of jsh_assetname.isystem
*
* @mbggenerated
*/
public Short getIsystem() {
return isystem;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetname.isystem
*
* @param isystem the value for jsh_assetname.isystem
*
* @mbggenerated
*/
public void setIsystem(Short isystem) {
this.isystem = isystem;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetname.isconsumables
*
* @return the value of jsh_assetname.isconsumables
*
* @mbggenerated
*/
public Short getIsconsumables() {
return isconsumables;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetname.isconsumables
*
* @param isconsumables the value for jsh_assetname.isconsumables
*
* @mbggenerated
*/
public void setIsconsumables(Short isconsumables) {
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.delete_Flag
*
* @return the value of jsh_assetname.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetname.delete_Flag
*
* @param deleteFlag the value for jsh_assetname.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_assetname.description
*
* @return the value of jsh_assetname.description
*
* @mbggenerated
*/
public String getDescription() {
return description;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_assetname.description
*
* @param description the value for jsh_assetname.description
*
* @mbggenerated
*/
public void setDescription(String description) {
this.description = description == null ? null : description.trim();
}
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment