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

从源更新

Browse Source
This commit is contained in:
qiankunpingtai
2019-07-29 10:20:17 +08:00
parent 331ca3e38f 0e46a9f21d
commit 2f77dfbf06
58 changed files with 1007 additions and 5226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/jsh/erp/controller/AccountHeadController.java
View File

@@ -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

40
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -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:

4
src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -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[]>();

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

@@ -1,678 +0,0 @@
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();
}
}

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

@@ -1,195 +0,0 @@
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();
}
}

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

File diff suppressed because it is too large Load Diff

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

@@ -1,259 +0,0 @@
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();
}
}

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

@@ -1,742 +0,0 @@
package com.jsh.erp.datasource.entities;
import java.util.ArrayList;
import java.util.List;
public class AssetNameExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public AssetNameExample() {
oredCriteria = new ArrayList<Criteria>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andAssetnameIsNull() {
addCriterion("assetname is null");
return (Criteria) this;
}
public Criteria andAssetnameIsNotNull() {
addCriterion("assetname is not null");
return (Criteria) this;
}
public Criteria andAssetnameEqualTo(String value) {
addCriterion("assetname =", value, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameNotEqualTo(String value) {
addCriterion("assetname <>", value, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameGreaterThan(String value) {
addCriterion("assetname >", value, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameGreaterThanOrEqualTo(String value) {
addCriterion("assetname >=", value, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameLessThan(String value) {
addCriterion("assetname <", value, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameLessThanOrEqualTo(String value) {
addCriterion("assetname <=", value, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameLike(String value) {
addCriterion("assetname like", value, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameNotLike(String value) {
addCriterion("assetname not like", value, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameIn(List<String> values) {
addCriterion("assetname in", values, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameNotIn(List<String> values) {
addCriterion("assetname not in", values, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameBetween(String value1, String value2) {
addCriterion("assetname between", value1, value2, "assetname");
return (Criteria) this;
}
public Criteria andAssetnameNotBetween(String value1, String value2) {
addCriterion("assetname not between", value1, value2, "assetname");
return (Criteria) this;
}
public Criteria andAssetcategoryidIsNull() {
addCriterion("assetcategoryID is null");
return (Criteria) this;
}
public Criteria andAssetcategoryidIsNotNull() {
addCriterion("assetcategoryID is not null");
return (Criteria) this;
}
public Criteria andAssetcategoryidEqualTo(Long value) {
addCriterion("assetcategoryID =", value, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidNotEqualTo(Long value) {
addCriterion("assetcategoryID <>", value, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidGreaterThan(Long value) {
addCriterion("assetcategoryID >", value, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidGreaterThanOrEqualTo(Long value) {
addCriterion("assetcategoryID >=", value, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidLessThan(Long value) {
addCriterion("assetcategoryID <", value, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidLessThanOrEqualTo(Long value) {
addCriterion("assetcategoryID <=", value, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidIn(List<Long> values) {
addCriterion("assetcategoryID in", values, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidNotIn(List<Long> values) {
addCriterion("assetcategoryID not in", values, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidBetween(Long value1, Long value2) {
addCriterion("assetcategoryID between", value1, value2, "assetcategoryid");
return (Criteria) this;
}
public Criteria andAssetcategoryidNotBetween(Long value1, Long value2) {
addCriterion("assetcategoryID not between", value1, value2, "assetcategoryid");
return (Criteria) this;
}
public Criteria andIsystemIsNull() {
addCriterion("isystem is null");
return (Criteria) this;
}
public Criteria andIsystemIsNotNull() {
addCriterion("isystem is not null");
return (Criteria) this;
}
public Criteria andIsystemEqualTo(Short value) {
addCriterion("isystem =", value, "isystem");
return (Criteria) this;
}
public Criteria andIsystemNotEqualTo(Short value) {
addCriterion("isystem <>", value, "isystem");
return (Criteria) this;
}
public Criteria andIsystemGreaterThan(Short value) {
addCriterion("isystem >", value, "isystem");
return (Criteria) this;
}
public Criteria andIsystemGreaterThanOrEqualTo(Short value) {
addCriterion("isystem >=", value, "isystem");
return (Criteria) this;
}
public Criteria andIsystemLessThan(Short value) {
addCriterion("isystem <", value, "isystem");
return (Criteria) this;
}
public Criteria andIsystemLessThanOrEqualTo(Short value) {
addCriterion("isystem <=", value, "isystem");
return (Criteria) this;
}
public Criteria andIsystemIn(List<Short> values) {
addCriterion("isystem in", values, "isystem");
return (Criteria) this;
}
public Criteria andIsystemNotIn(List<Short> values) {
addCriterion("isystem not in", values, "isystem");
return (Criteria) this;
}
public Criteria andIsystemBetween(Short value1, Short value2) {
addCriterion("isystem between", value1, value2, "isystem");
return (Criteria) this;
}
public Criteria andIsystemNotBetween(Short value1, Short value2) {
addCriterion("isystem not between", value1, value2, "isystem");
return (Criteria) this;
}
public Criteria andIsconsumablesIsNull() {
addCriterion("isconsumables is null");
return (Criteria) this;
}
public Criteria andIsconsumablesIsNotNull() {
addCriterion("isconsumables is not null");
return (Criteria) this;
}
public Criteria andIsconsumablesEqualTo(Short value) {
addCriterion("isconsumables =", value, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesNotEqualTo(Short value) {
addCriterion("isconsumables <>", value, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesGreaterThan(Short value) {
addCriterion("isconsumables >", value, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesGreaterThanOrEqualTo(Short value) {
addCriterion("isconsumables >=", value, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesLessThan(Short value) {
addCriterion("isconsumables <", value, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesLessThanOrEqualTo(Short value) {
addCriterion("isconsumables <=", value, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesIn(List<Short> values) {
addCriterion("isconsumables in", values, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesNotIn(List<Short> values) {
addCriterion("isconsumables not in", values, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesBetween(Short value1, Short value2) {
addCriterion("isconsumables between", value1, value2, "isconsumables");
return (Criteria) this;
}
public Criteria andIsconsumablesNotBetween(Short value1, Short value2) {
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;
}
public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null");
return (Criteria) this;
}
public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null");
return (Criteria) this;
}
public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
return (Criteria) this;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_assetname
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_assetname
*
* @mbggenerated
*/
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

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

@@ -10,6 +10,8 @@ public class MaterialVo4Unit extends Material{
private String materialOther;
private Long stock;
public String getUnitName() {
return unitName;
}
@@ -33,4 +35,12 @@ public class MaterialVo4Unit extends Material{
public void setMaterialOther(String materialOther) {
this.materialOther = materialOther;
}
public Long getStock() {
return stock;
}
public void setStock(Long stock) {
this.stock = stock;
}
}

96
src/main/java/com/jsh/erp/datasource/mappers/AssetCategoryMapper.java
View File

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

120
src/main/java/com/jsh/erp/datasource/mappers/AssetMapper.java
View File

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

120
src/main/java/com/jsh/erp/datasource/mappers/AssetNameMapper.java
View File

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

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

@@ -110,10 +110,11 @@ public interface DepotHeadMapperEx {
* */
void updatedepotHead(DepotHead depotHead);
void updateBuildOnlyNumber();
/**
* 获得一个全局唯一的数作为订单号的追加
* */
Long getBuildOnlyNumber(@Param("seq_name") String seq_name);
Long getBuildOnlyNumber(@Param("seq_name") String seq_name);
int batchDeleteDepotHeadByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);

4
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
View File

@@ -45,10 +45,10 @@ public interface DepotItemMapperEx {
@Param("mId") Long mId,
@Param("monthTime") String monthTime);
int findByTypeAndMaterialIdIn(
Long findByTypeAndMaterialIdIn(
@Param("mId") Long mId);
int findByTypeAndMaterialIdOut(
Long findByTypeAndMaterialIdOut(
@Param("mId") Long mId);
int findByTypeAndDepotIdAndMaterialIdIn(

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

@@ -20,7 +20,6 @@ public interface MaterialMapperEx {
List<MaterialVo4Unit> selectByConditionMaterial(
@Param("name") String name,
@Param("model") String model,
@Param("categoryId") Long categoryId,
@Param("categoryIds") String categoryIds,
@Param("mpList") String mpList,
@Param("offset") Integer offset,
@@ -29,7 +28,6 @@ public interface MaterialMapperEx {
Long countsByMaterial(
@Param("name") String name,
@Param("model") String model,
@Param("categoryId") Long categoryId,
@Param("categoryIds") String categoryIds,
@Param("mpList") String mpList);
@@ -46,7 +44,6 @@ public interface MaterialMapperEx {
List<MaterialVo4Unit> findByAll(
@Param("name") String name,
@Param("model") String model,
@Param("categoryId") Long categoryId,
@Param("categoryIds") String categoryIds);
/**
* 通过商品名称查询商品信息

4
src/main/java/com/jsh/erp/service/ResourceInfo.java
View File

@@ -24,6 +24,10 @@ import java.lang.annotation.*;
* depotItem-90
* accountHead-95
* accountItem-100
* serialNumber-105
* organization-110
* orgaUserRel-115
* tenant-120
*/
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)

50
src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
View File

@@ -208,6 +208,56 @@ public class AccountHeadService {
return result;
}
/**
* 统计总金额
* @param getS
* @param type
* @param mode 合计或者金额
* @param endTime
* @return
*/
public BigDecimal allMoney(String getS, String type, String mode, String endTime) {
BigDecimal allMoney = BigDecimal.ZERO;
try {
Integer supplierId = Integer.valueOf(getS);
BigDecimal sum = 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;
}
/**
* 查询单位的累计应收和累计应付，收预付款不计入此处
* @param supplierId
* @param endTime
* @param supType
* @return
*/
public BigDecimal findTotalPay(Integer supplierId, String endTime, String supType) {
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
int i = 1;
if (("customer").equals(supType)) { //客户
i = 1;
} else if (("vendor").equals(supType)) { //供应商
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)));
return sum;
}
public List<AccountHeadVo4ListEx> getDetailByNumber(String billNo)throws Exception {
List<AccountHeadVo4ListEx> resList = new ArrayList<AccountHeadVo4ListEx>();
List<AccountHeadVo4ListEx> list = null;

55
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -264,10 +264,12 @@ public class DepotHeadService {
/**
* 创建一个唯一的序列号
* */
public String buildOnlyNumber()throws Exception{
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public String buildOnlyNumber()throws Exception{
Long buildOnlyNumber=null;
synchronized (this){
try{
depotHeadMapperEx.updateBuildOnlyNumber(); //编号+1
buildOnlyNumber= depotHeadMapperEx.getBuildOnlyNumber(BusinessConstants.DEPOT_NUMBER_SEQ);
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
@@ -275,7 +277,6 @@ public class DepotHeadService {
throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE,
ExceptionConstants.DATA_WRITE_FAIL_MSG);
}
}
if(buildOnlyNumber<BusinessConstants.SEQ_TO_STRING_MIN_LENGTH){
StringBuffer sb=new StringBuffer(buildOnlyNumber.toString());
@@ -434,6 +435,56 @@ public class DepotHeadService {
return result;
}
/**
* 统计总金额
* @param getS
* @param type
* @param subType
* @param mode 合计或者金额
* @return
*/
public BigDecimal allMoney(String getS, String type, String subType, String mode, String endTime) {
BigDecimal allMoney = BigDecimal.ZERO;
try {
Integer supplierId = Integer.valueOf(getS);
BigDecimal sum = 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;
}
/**
* 查询单位的累计应收和累计应付，零售不能计入
* @param supplierId
* @param endTime
* @param supType
* @return
*/
public BigDecimal findTotalPay(Integer supplierId, String endTime, String supType) {
BigDecimal sum = BigDecimal.ZERO;
String getS = supplierId.toString();
int i = 1;
if (("customer").equals(supType)) { //客户
i = 1;
} else if (("vendor").equals(supType)) { //供应商
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)));
return sum;
}
public List<DepotHeadVo4List> getDetailByNumber(String number)throws Exception {
List<DepotHeadVo4List> resList = new ArrayList<DepotHeadVo4List>();
List<DepotHeadVo4List> list = null;

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

@@ -291,8 +291,8 @@ public class DepotItemService {
return depotItemMapper.updateByPrimaryKeySelective(depotItem);
}
public int findByTypeAndMaterialId(String type, Long mId) throws Exception{
int result =0;
public Long findByTypeAndMaterialId(String type, Long mId) throws Exception{
Long result = 0l;
try{
if(type.equals(TYPE)) {
result= depotItemMapperEx.findByTypeAndMaterialIdIn(mId);

6
src/main/java/com/jsh/erp/service/material/MaterialComponent.java
View File

@@ -34,11 +34,10 @@ public class MaterialComponent implements ICommonQuery {
String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name");
String model = StringUtil.getInfo(search, "model");
Long categoryId = Long.parseLong(StringUtil.getInfo(search, "categoryId"));
String categoryIds = StringUtil.getInfo(search, "categoryIds");
String mpList = StringUtil.getInfo(search, "mpList");
String order = QueryUtils.order(map);
return materialService.select(name, model,categoryId,categoryIds,mpList, QueryUtils.offset(map), QueryUtils.rows(map));
return materialService.select(name, model,categoryIds,mpList, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
@@ -46,10 +45,9 @@ public class MaterialComponent implements ICommonQuery {
String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name");
String model = StringUtil.getInfo(search, "model");
Long categoryId = Long.parseLong(StringUtil.getInfo(search, "categoryId"));
String categoryIds = StringUtil.getInfo(search, "categoryIds");
String mpList = StringUtil.getInfo(search, "mpList");
return materialService.countMaterial(name, model,categoryId,categoryIds,mpList);
return materialService.countMaterial(name, model,categoryIds,mpList);
}
@Override

18
src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -9,6 +9,7 @@ import com.jsh.erp.datasource.mappers.DepotItemMapperEx;
import com.jsh.erp.datasource.mappers.MaterialMapper;
import com.jsh.erp.datasource.mappers.MaterialMapperEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.BaseResponseInfo;
@@ -38,6 +39,8 @@ public class MaterialService {
private UserService userService;
@Resource
private DepotItemMapperEx depotItemMapperEx;
@Resource
private DepotItemService depotItemService;
public Material getMaterial(long id)throws Exception {
Material result=null;
@@ -67,13 +70,13 @@ public class MaterialService {
return list;
}
public List<MaterialVo4Unit> select(String name, String model,Long categoryId, String categoryIds,String mpList, int offset, int rows)
public List<MaterialVo4Unit> select(String name, String model, String categoryIds,String mpList, int offset, int rows)
throws Exception{
String[] mpArr = mpList.split(",");
List<MaterialVo4Unit> resList = new ArrayList<MaterialVo4Unit>();
List<MaterialVo4Unit> list =null;
try{
list= materialMapperEx.selectByConditionMaterial(name, model,categoryId,categoryIds,mpList, offset, rows);
list= materialMapperEx.selectByConditionMaterial(name, model,categoryIds,mpList, offset, rows);
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
@@ -105,16 +108,19 @@ public class MaterialService {
}
}
m.setMaterialOther(materialOther);
Long InSum = depotItemService.findByTypeAndMaterialId("入库", m.getId());
Long OutSum = depotItemService.findByTypeAndMaterialId("出库", m.getId());
m.setStock(InSum - OutSum);
resList.add(m);
}
}
return resList;
}
public Long countMaterial(String name, String model,Long categoryId, String categoryIds,String mpList)throws Exception {
public Long countMaterial(String name, String model, String categoryIds,String mpList)throws Exception {
Long result =null;
try{
result= materialMapperEx.countsByMaterial(name, model,categoryId,categoryIds,mpList);
result= materialMapperEx.countsByMaterial(name, model,categoryIds,mpList);
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
@@ -314,11 +320,11 @@ public class MaterialService {
return list;
}
public List<MaterialVo4Unit> findByAll(String name, String model, Long categoryId, String categoryIds)throws Exception {
public List<MaterialVo4Unit> findByAll(String name, String model, String categoryIds)throws Exception {
List<MaterialVo4Unit> resList = new ArrayList<MaterialVo4Unit>();
List<MaterialVo4Unit> list =null;
try{
list= materialMapperEx.findByAll(name, model, categoryId, categoryIds);
list= materialMapperEx.findByAll(name, model, categoryIds);
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);

25
src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
View File

@@ -22,6 +22,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -68,12 +69,9 @@ public class MaterialCategoryService {
}
public List<MaterialCategory> getAllList(Long parentId)throws Exception {
MaterialCategoryExample example = new MaterialCategoryExample();
example.createCriteria().andParentidEqualTo(parentId).andIdNotEqualTo(1l);
example.setOrderByClause("id");
List<MaterialCategory> list=null;
try{
list=materialCategoryMapper.selectByExample(example);
list = getMCList(parentId);
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
@@ -83,6 +81,25 @@ public class MaterialCategoryService {
return list;
}
public List<MaterialCategory> getMCList(Long parentId)throws Exception {
List<MaterialCategory> res= new ArrayList<MaterialCategory>();
List<MaterialCategory> list=null;
MaterialCategoryExample example = new MaterialCategoryExample();
example.createCriteria().andParentidEqualTo(parentId).andIdNotEqualTo(1l);
example.setOrderByClause("id");
list=materialCategoryMapper.selectByExample(example);
if(list!=null && list.size()>0) {
res.addAll(list);
for(MaterialCategory mc : list) {
List<MaterialCategory> mcList = getMCList(mc.getId());
if(mcList!=null && mcList.size()>0) {
res.addAll(mcList);
}
}
}
return res;
}
public List<MaterialCategory> select(String name, Integer parentId, int offset, int rows) throws Exception{
List<MaterialCategory> list=null;
try{

50
src/main/java/com/jsh/erp/service/supplier/SupplierService.java
View File

@@ -10,6 +10,8 @@ import com.jsh.erp.datasource.mappers.DepotHeadMapperEx;
import com.jsh.erp.datasource.mappers.SupplierMapper;
import com.jsh.erp.datasource.mappers.SupplierMapperEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.accountHead.AccountHeadService;
import com.jsh.erp.service.depotHead.DepotHeadService;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.BaseResponseInfo;
@@ -24,10 +26,9 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import static com.jsh.erp.utils.Tools.getNow3;
@Service
public class SupplierService {
@@ -46,6 +47,10 @@ public class SupplierService {
private AccountHeadMapperEx accountHeadMapperEx;
@Resource
private DepotHeadMapperEx depotHeadMapperEx;
@Resource
private DepotHeadService depotHeadService;
@Resource
private AccountHeadService accountHeadService;
public Supplier getSupplier(long id)throws Exception {
Supplier result=null;
@@ -77,16 +82,47 @@ public class SupplierService {
public List<Supplier> select(String supplier, String type, String phonenum,
String telephone, String description, int offset, int rows) throws Exception{
List<Supplier> list=null;
List<Supplier> resList = new ArrayList<Supplier>();
try{
list=supplierMapperEx.selectByConditionSupplier(supplier, type, phonenum, telephone, description, offset, rows);
List<Supplier> list = supplierMapperEx.selectByConditionSupplier(supplier, type, phonenum, telephone, description, offset, rows);
for(Supplier s : list) {
Integer supplierId = s.getId().intValue();
String endTime = getNow3();
String supType = null;
if(("客户").equals(s.getType())) {
supType = "customer";
} else if(("供应商").equals(s.getType())) {
supType = "vendor";
}
BigDecimal sum = BigDecimal.ZERO;
BigDecimal beginNeedGet = s.getBeginneedget();
if(beginNeedGet==null) {
beginNeedGet = BigDecimal.ZERO;
}
BigDecimal beginNeedPay = s.getBeginneedpay();
if(beginNeedPay==null) {
beginNeedPay = BigDecimal.ZERO;
}
sum = sum.add(depotHeadService.findTotalPay(supplierId, endTime, supType));
sum = sum.add(accountHeadService.findTotalPay(supplierId, endTime, supType));
if(("客户").equals(s.getType())) {
sum = sum.add(beginNeedGet).subtract(beginNeedPay);
s.setAllneedget(sum);
s.setAllneedpay(BigDecimal.ZERO);
} else if(("供应商").equals(s.getType())) {
sum = sum.add(beginNeedPay).subtract(beginNeedGet);
s.setAllneedget(BigDecimal.ZERO);
s.setAllneedpay(sum);
}
resList.add(s);
}
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE,
ExceptionConstants.DATA_READ_FAIL_MSG);
}
return list;
return resList;
}
public Long countSupplier(String supplier, String type, String phonenum, String telephone, String description) throws Exception{