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

优化表结构

Browse Source
This commit is contained in:
季圣华
2020-07-21 23:09:20 +08:00
parent 70f0dae473
commit a4774016c8
53 changed files with 5771 additions and 7185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsh/erp/controller/AccountItemController.java
View File

@@ -86,11 +86,11 @@ public class AccountItemController {
for (AccountItemVo4List ai : dataList) {
JSONObject item = new JSONObject();
item.put("Id", ai.getId());
item.put("AccountId", ai.getAccountid());
item.put("AccountId", ai.getAccountId());
item.put("AccountName", ai.getAccountName());
item.put("InOutItemId", ai.getInoutitemid());
item.put("InOutItemId", ai.getInOutItemId());
item.put("InOutItemName", ai.getInOutItemName());
BigDecimal eachAmount = ai.getEachamount();
BigDecimal eachAmount = ai.getEachAmount();
item.put("EachAmount", (eachAmount.compareTo(BigDecimal.ZERO))==-1 ? BigDecimal.ZERO.subtract(eachAmount): eachAmount);
item.put("Remark", ai.getRemark());
dataArray.add(item);

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

@@ -184,30 +184,30 @@ public class DepotItemController {
String materialOther = getOtherInfo(mpArr, diEx);
MaterialName = MaterialName + materialOther + ((diEx.getUnitName() == null || diEx.getUnitName().equals("")) ? "" : "(" + diEx.getUnitName() + ")") + ratio;
item.put("MaterialName", MaterialName == null ? "" : MaterialName);
BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId);
BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotId(),diEx.getMaterialId(),null,null,tenantId);
item.put("Stock", stock);
item.put("Unit", diEx.getMunit());
item.put("currentStock", diEx.getOpernumber().add(stock));
item.put("OperNumber", diEx.getOpernumber());
item.put("BasicNumber", diEx.getBasicnumber());
item.put("UnitPrice", diEx.getUnitprice());
item.put("TaxUnitPrice", diEx.getTaxunitprice());
item.put("AllPrice", diEx.getAllprice());
item.put("Unit", diEx.getMaterialUnit());
item.put("currentStock", diEx.getOperNumber().add(stock));
item.put("OperNumber", diEx.getOperNumber());
item.put("BasicNumber", diEx.getBasicNumber());
item.put("UnitPrice", diEx.getUnitPrice());
item.put("TaxUnitPrice", diEx.getTaxUnitPrice());
item.put("AllPrice", diEx.getAllPrice());
item.put("Remark", diEx.getRemark());
item.put("Img", diEx.getImg());
item.put("DepotId", diEx.getDepotid() == null ? "" : diEx.getDepotid());
item.put("DepotName", diEx.getDepotid() == null ? "" : diEx.getDepotName());
item.put("AnotherDepotId", diEx.getAnotherdepotid() == null ? "" : diEx.getAnotherdepotid());
item.put("AnotherDepotName", diEx.getAnotherdepotid() == null ? "" : diEx.getAnotherDepotName());
item.put("TaxRate", diEx.getTaxrate());
item.put("TaxMoney", diEx.getTaxmoney());
item.put("TaxLastMoney", diEx.getTaxlastmoney());
item.put("OtherField1", diEx.getOtherfield1());
item.put("OtherField2", diEx.getOtherfield2());
item.put("OtherField3", diEx.getOtherfield3());
item.put("OtherField4", diEx.getOtherfield4());
item.put("OtherField5", diEx.getOtherfield5());
item.put("MType", diEx.getMtype());
item.put("DepotId", diEx.getDepotId() == null ? "" : diEx.getDepotId());
item.put("DepotName", diEx.getDepotId() == null ? "" : diEx.getDepotName());
item.put("AnotherDepotId", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotId());
item.put("AnotherDepotName", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotName());
item.put("TaxRate", diEx.getTaxRate());
item.put("TaxMoney", diEx.getTaxMoney());
item.put("TaxLastMoney", diEx.getTaxLastMoney());
item.put("OtherField1", diEx.getOtherField1());
item.put("OtherField2", diEx.getOtherField2());
item.put("OtherField3", diEx.getOtherField3());
item.put("OtherField4", diEx.getOtherField4());
item.put("OtherField5", diEx.getOtherField5());
item.put("MType", diEx.getMaterialType());
item.put("op", 1);
dataArray.add(item);
}
@@ -332,10 +332,10 @@ public class DepotItemController {
* 导出excel表格
* @param currentPage
* @param pageSize
* @param projectId
* @param depotId
* @param monthTime
* @param headIds
* @param materialIds
* @param name
* @param model
* @param request
* @param response
* @return
@@ -384,10 +384,10 @@ public class DepotItemController {
/**
* 统计总计金额
* @param pid
* @param depotId
* @param monthTime
* @param headIds
* @param materialIds
* @param name
* @param model
* @param request
* @return
*/
@@ -429,8 +429,8 @@ public class DepotItemController {
* @param currentPage
* @param pageSize
* @param monthTime
* @param headIds
* @param materialIds
* @param name
* @param model
* @param mpList
* @param request
* @return
@@ -492,8 +492,8 @@ public class DepotItemController {
* @param currentPage
* @param pageSize
* @param monthTime
* @param headIds
* @param materialIds
* @param name
* @param model
* @param mpList
* @param request
* @return
@@ -648,7 +648,6 @@ public class DepotItemController {
* @param currentPage
* @param pageSize
* @param projectId
* @param monthTime
* @param request
* @param response
* @return

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

@@ -153,7 +153,7 @@ public class MaterialController {
JSONObject item = new JSONObject();
item.put("Id", material.getMeId()); //商品扩展表的id
String ratio; //比例
if (material.getUnitid() == null || material.getUnitid().equals("")) {
if (material.getUnitId() == null || material.getUnitId().equals("")) {
ratio = "";
} else {
ratio = material.getUnitName();
@@ -178,13 +178,13 @@ public class MaterialController {
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
}
if (mpArr[i].equals("自定义1")) {
expand = expand + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
expand = expand + ((material.getOtherField1() == null || material.getOtherField1().equals("")) ? "" : "(" + material.getOtherField1() + ")");
}
if (mpArr[i].equals("自定义2")) {
expand = expand + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
expand = expand + ((material.getOtherField2() == null || material.getOtherField2().equals("")) ? "" : "(" + material.getOtherField2() + ")");
}
if (mpArr[i].equals("自定义3")) {
expand = expand + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
expand = expand + ((material.getOtherField3() == null || material.getOtherField3().equals("")) ? "" : "(" + material.getOtherField3() + ")");
}
}
MaterialName = MaterialName + expand + ((material.getCommodityUnit() == null || material.getCommodityUnit().equals("")) ? "" : "(" + material.getCommodityUnit() + ")") + ratio;
@@ -229,7 +229,7 @@ public class MaterialController {
MaterialVo4Unit material = materialList.get(0);
item.put("Id", material.getMeId()); //商品扩展表的id
String ratio; //比例
if (material.getUnitid() == null || material.getUnitid().equals("")) {
if (material.getUnitId() == null || material.getUnitId().equals("")) {
ratio = "";
} else {
ratio = material.getUnitName();
@@ -248,13 +248,13 @@ public class MaterialController {
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
}
if (mpArr[i].equals("自定义1")) {
expand = expand + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
expand = expand + ((material.getOtherField1() == null || material.getOtherField1().equals("")) ? "" : "(" + material.getOtherField1() + ")");
}
if (mpArr[i].equals("自定义2")) {
expand = expand + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
expand = expand + ((material.getOtherField2() == null || material.getOtherField2().equals("")) ? "" : "(" + material.getOtherField2() + ")");
}
if (mpArr[i].equals("自定义3")) {
expand = expand + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
expand = expand + ((material.getOtherField3() == null || material.getOtherField3().equals("")) ? "" : "(" + material.getOtherField3() + ")");
}
}
MaterialName = MaterialName + expand + ((material.getUnit() == null || material.getUnit().equals("")) ? "" : "(" + material.getUnit() + ")") + ratio;
@@ -297,7 +297,7 @@ public class MaterialController {
objs[0] = m.getName();
objs[1] = m.getCategoryName();
objs[2] = m.getModel();
objs[3] = m.getSafetystock() == null? "" : m.getSafetystock().toString();
objs[3] = m.getSafetyStock() == null? "" : m.getSafetyStock().toString();
objs[4] = m.getCommodityUnit();
objs[5] = m.getCommodityDecimal() == null? "" : m.getCommodityDecimal().toString();
objs[6] = m.getLowDecimal() == null? "" : m.getLowDecimal().toString();

50
src/main/java/com/jsh/erp/controller/SupplierController.java
View File

@@ -154,7 +154,7 @@ public class SupplierController {
item.put("id", supplier.getId());
//客户名称
item.put("supplier", supplier.getSupplier());
item.put("advanceIn", supplier.getAdvancein()); //预付款金额
item.put("advanceIn", supplier.getAdvanceIn()); //预付款金额
dataArray.add(item);
}
}
@@ -186,11 +186,11 @@ public class SupplierController {
item.put("supplier", supplier.getSupplier());
item.put("type", supplier.getType());
item.put("contacts", supplier.getContacts());
item.put("phonenum", supplier.getPhonenum());
item.put("phonenum", supplier.getPhoneNum());
item.put("email", supplier.getEmail());
item.put("AdvanceIn", supplier.getAdvancein());
item.put("BeginNeedGet", supplier.getBeginneedget());
item.put("BeginNeedPay", supplier.getBeginneedpay());
item.put("AdvanceIn", supplier.getAdvanceIn());
item.put("BeginNeedGet", supplier.getBeginNeedGet());
item.put("BeginNeedPay", supplier.getBeginNeedPay());
/**
* 2018-01-28这里会有空指针异常
* */
@@ -201,10 +201,10 @@ public class SupplierController {
item.put("fax", supplier.getFax());
item.put("telephone", supplier.getTelephone());
item.put("address", supplier.getAddress());
item.put("taxNum", supplier.getTaxnum());
item.put("bankName", supplier.getBankname());
item.put("accountNumber", supplier.getAccountnumber());
item.put("taxRate", supplier.getTaxrate());
item.put("taxNum", supplier.getTaxNum());
item.put("bankName", supplier.getBankName());
item.put("accountNumber", supplier.getAccountNumber());
item.put("taxRate", supplier.getTaxRate());
item.put("enabled", supplier.getEnabled());
dataArray.add(item);
}
@@ -315,19 +315,19 @@ public class SupplierController {
objs[0] = s.getSupplier();
objs[1] = s.getType();
objs[2] = s.getContacts();
objs[3] = s.getPhonenum();
objs[3] = s.getPhoneNum();
objs[4] = s.getEmail();
objs[5] = s.getAdvancein() == null? "" : s.getAdvancein().toString();
objs[6] = s.getBeginneedget() == null? "" : s.getBeginneedget().toString();
objs[7] = s.getBeginneedpay() == null? "" : s.getBeginneedpay().toString();
objs[5] = s.getAdvanceIn() == null? "" : s.getAdvanceIn().toString();
objs[6] = s.getBeginNeedGet() == null? "" : s.getBeginNeedGet().toString();
objs[7] = s.getBeginNeedPay() == null? "" : s.getBeginNeedPay().toString();
objs[8] = s.getDescription();
objs[9] = s.getFax();
objs[10] = s.getTelephone();
objs[11] = s.getAddress();
objs[12] = s.getTaxnum();
objs[13] = s.getBankname();
objs[14] = s.getAccountnumber();
objs[15] = s.getTaxrate() == null? "" : s.getTaxrate().toString();
objs[12] = s.getTaxNum();
objs[13] = s.getBankName();
objs[14] = s.getAccountNumber();
objs[15] = s.getTaxRate() == null? "" : s.getTaxRate().toString();
objs[16] = s.getEnabled() ? "启用" : "禁用";
objects.add(objs);
}
@@ -404,19 +404,19 @@ public class SupplierController {
s.setSupplier(ExcelUtils.getContent(src, i, 0));
s.setType(ExcelUtils.getContent(src, i, 1));
s.setContacts(ExcelUtils.getContent(src, i, 2));
s.setPhonenum(ExcelUtils.getContent(src, i, 3));
s.setPhoneNum(ExcelUtils.getContent(src, i, 3));
s.setEmail(ExcelUtils.getContent(src, i, 4));
s.setAdvancein(parseBigDecimalEx(ExcelUtils.getContent(src, i, 5)));
s.setBeginneedget(parseBigDecimalEx(ExcelUtils.getContent(src, i, 6)));
s.setBeginneedpay(parseBigDecimalEx(ExcelUtils.getContent(src, i, 7)));
s.setAdvanceIn(parseBigDecimalEx(ExcelUtils.getContent(src, i, 5)));
s.setBeginNeedGet(parseBigDecimalEx(ExcelUtils.getContent(src, i, 6)));
s.setBeginNeedPay(parseBigDecimalEx(ExcelUtils.getContent(src, i, 7)));
s.setDescription(ExcelUtils.getContent(src, i, 8));
s.setFax(ExcelUtils.getContent(src, i, 9));
s.setTelephone(ExcelUtils.getContent(src, i, 10));
s.setAddress(ExcelUtils.getContent(src, i, 11));
s.setTaxnum(ExcelUtils.getContent(src, i, 12));
s.setBankname(ExcelUtils.getContent(src, i, 13));
s.setAccountnumber(ExcelUtils.getContent(src, i, 14));
s.setTaxrate(parseBigDecimalEx(ExcelUtils.getContent(src, i, 15)));
s.setTaxNum(ExcelUtils.getContent(src, i, 12));
s.setBankName(ExcelUtils.getContent(src, i, 13));
s.setAccountNumber(ExcelUtils.getContent(src, i, 14));
s.setTaxRate(parseBigDecimalEx(ExcelUtils.getContent(src, i, 15)));
String enabled = ExcelUtils.getContent(src, i, 16);
s.setEnabled(enabled.equals("启用")? true: false);
s.setIsystem(Byte.parseByte("1"));

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

@@ -4,386 +4,122 @@ import java.math.BigDecimal;
import java.util.Date;
public class AccountHead {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.OrganId
*
* @mbggenerated
*/
private Long organid;
private Long organId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
private Long handspersonid;
private Long handsPersonId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
private BigDecimal changeamount;
private BigDecimal changeAmount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
private BigDecimal totalprice;
private BigDecimal totalPrice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.AccountId
*
* @mbggenerated
*/
private Long accountid;
private Long accountId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillNo
*
* @mbggenerated
*/
private String billno;
private String billNo;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillTime
*
* @mbggenerated
*/
private Date billtime;
private Date billTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Id
*
* @return the value of jsh_accounthead.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Id
*
* @param id the value for jsh_accounthead.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Type
*
* @return the value of jsh_accounthead.Type
*
* @mbggenerated
*/
public String getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Type
*
* @param type the value for jsh_accounthead.Type
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.OrganId
*
* @return the value of jsh_accounthead.OrganId
*
* @mbggenerated
*/
public Long getOrganid() {
return organid;
public Long getOrganId() {
return organId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.OrganId
*
* @param organid the value for jsh_accounthead.OrganId
*
* @mbggenerated
*/
public void setOrganid(Long organid) {
this.organid = organid;
public void setOrganId(Long organId) {
this.organId = organId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.HandsPersonId
*
* @return the value of jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public Long getHandspersonid() {
return handspersonid;
public Long getHandsPersonId() {
return handsPersonId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.HandsPersonId
*
* @param handspersonid the value for jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
public void setHandsPersonId(Long handsPersonId) {
this.handsPersonId = handsPersonId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.ChangeAmount
*
* @return the value of jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public BigDecimal getChangeamount() {
return changeamount;
public BigDecimal getChangeAmount() {
return changeAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.ChangeAmount
*
* @param changeamount the value for jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.TotalPrice
*
* @return the value of jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public BigDecimal getTotalprice() {
return totalprice;
public BigDecimal getTotalPrice() {
return totalPrice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.TotalPrice
*
* @param totalprice the value for jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
public void setTotalPrice(BigDecimal totalPrice) {
this.totalPrice = totalPrice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.AccountId
*
* @return the value of jsh_accounthead.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
public Long getAccountId() {
return accountId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.AccountId
*
* @param accountid the value for jsh_accounthead.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillNo
*
* @return the value of jsh_accounthead.BillNo
*
* @mbggenerated
*/
public String getBillno() {
return billno;
public String getBillNo() {
return billNo;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillNo
*
* @param billno the value for jsh_accounthead.BillNo
*
* @mbggenerated
*/
public void setBillno(String billno) {
this.billno = billno == null ? null : billno.trim();
public void setBillNo(String billNo) {
this.billNo = billNo == null ? null : billNo.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillTime
*
* @return the value of jsh_accounthead.BillTime
*
* @mbggenerated
*/
public Date getBilltime() {
return billtime;
public Date getBillTime() {
return billTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillTime
*
* @param billtime the value for jsh_accounthead.BillTime
*
* @mbggenerated
*/
public void setBilltime(Date billtime) {
this.billtime = billtime;
public void setBillTime(Date billTime) {
this.billTime = billTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Remark
*
* @return the value of jsh_accounthead.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Remark
*
* @param remark the value for jsh_accounthead.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.tenant_id
*
* @return the value of jsh_accounthead.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.tenant_id
*
* @param tenantId the value for jsh_accounthead.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.delete_Flag
*
* @return the value of jsh_accounthead.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.delete_Flag
*
* @param deleteFlag the value for jsh_accounthead.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}

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

File diff suppressed because it is too large Load Diff

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

@@ -9,19 +9,19 @@ public class AccountHeadVo4ListEx {
private String type;
private Long organid;
private Long organId;
private Long handspersonid;
private Long handsPersonId;
private BigDecimal changeamount;
private BigDecimal changeAmount;
private BigDecimal totalprice;
private BigDecimal totalPrice;
private Long accountid;
private Long accountId;
private String billno;
private String billNo;
private Date billtime;
private Date billTime;
private String remark;
@@ -29,11 +29,11 @@ public class AccountHeadVo4ListEx {
private String deleteFlag;
private String organname;
private String organName;
private String handspersonname;
private String handsPersonName;
private String accountname;
private String accountName;
private String billTimeStr;
@@ -53,60 +53,60 @@ public class AccountHeadVo4ListEx {
this.type = type;
}
public Long getOrganid() {
return organid;
public Long getOrganId() {
return organId;
}
public void setOrganid(Long organid) {
this.organid = organid;
public void setOrganId(Long organId) {
this.organId = organId;
}
public Long getHandspersonid() {
return handspersonid;
public Long getHandsPersonId() {
return handsPersonId;
}
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
public void setHandsPersonId(Long handsPersonId) {
this.handsPersonId = handsPersonId;
}
public BigDecimal getChangeamount() {
return changeamount;
public BigDecimal getChangeAmount() {
return changeAmount;
}
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
public BigDecimal getTotalprice() {
return totalprice;
public BigDecimal getTotalPrice() {
return totalPrice;
}
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
public void setTotalPrice(BigDecimal totalPrice) {
this.totalPrice = totalPrice;
}
public Long getAccountid() {
return accountid;
public Long getAccountId() {
return accountId;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public String getBillno() {
return billno;
public String getBillNo() {
return billNo;
}
public void setBillno(String billno) {
this.billno = billno;
public void setBillNo(String billNo) {
this.billNo = billNo;
}
public Date getBilltime() {
return billtime;
public Date getBillTime() {
return billTime;
}
public void setBilltime(Date billtime) {
this.billtime = billtime;
public void setBillTime(Date billTime) {
this.billTime = billTime;
}
public String getRemark() {
@@ -133,28 +133,28 @@ public class AccountHeadVo4ListEx {
this.deleteFlag = deleteFlag;
}
public String getOrganname() {
return organname;
public String getOrganName() {
return organName;
}
public void setOrganname(String organname) {
this.organname = organname;
public void setOrganName(String organName) {
this.organName = organName;
}
public String getHandspersonname() {
return handspersonname;
public String getHandsPersonName() {
return handsPersonName;
}
public void setHandspersonname(String handspersonname) {
this.handspersonname = handspersonname;
public void setHandsPersonName(String handsPersonName) {
this.handsPersonName = handsPersonName;
}
public String getAccountname() {
return accountname;
public String getAccountName() {
return accountName;
}
public void setAccountname(String accountname) {
this.accountname = accountname;
public void setAccountName(String accountName) {
this.accountName = accountName;
}
public String getBillTimeStr() {

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

@@ -3,258 +3,82 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class AccountItem {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.HeaderId
*
* @mbggenerated
*/
private Long headerid;
private Long headerId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.AccountId
*
* @mbggenerated
*/
private Long accountid;
private Long accountId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
private Long inoutitemid;
private Long inOutItemId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.EachAmount
*
* @mbggenerated
*/
private BigDecimal eachamount;
private BigDecimal eachAmount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Id
*
* @return the value of jsh_accountitem.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Id
*
* @param id the value for jsh_accountitem.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.HeaderId
*
* @return the value of jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public Long getHeaderid() {
return headerid;
public Long getHeaderId() {
return headerId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.HeaderId
*
* @param headerid the value for jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public void setHeaderid(Long headerid) {
this.headerid = headerid;
public void setHeaderId(Long headerId) {
this.headerId = headerId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.AccountId
*
* @return the value of jsh_accountitem.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
public Long getAccountId() {
return accountId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.AccountId
*
* @param accountid the value for jsh_accountitem.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.InOutItemId
*
* @return the value of jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public Long getInoutitemid() {
return inoutitemid;
public Long getInOutItemId() {
return inOutItemId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.InOutItemId
*
* @param inoutitemid the value for jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
public void setInOutItemId(Long inOutItemId) {
this.inOutItemId = inOutItemId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.EachAmount
*
* @return the value of jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public BigDecimal getEachamount() {
return eachamount;
public BigDecimal getEachAmount() {
return eachAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.EachAmount
*
* @param eachamount the value for jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount;
public void setEachAmount(BigDecimal eachAmount) {
this.eachAmount = eachAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Remark
*
* @return the value of jsh_accountitem.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Remark
*
* @param remark the value for jsh_accountitem.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.tenant_id
*
* @return the value of jsh_accountitem.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.tenant_id
*
* @param tenantId the value for jsh_accountitem.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.delete_Flag
*
* @return the value of jsh_accountitem.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.delete_Flag
*
* @param deleteFlag the value for jsh_accountitem.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}

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

@@ -5,118 +5,46 @@ import java.util.ArrayList;
import java.util.List;
public class AccountItemExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
public AccountItemExample() {
oredCriteria = new ArrayList<Criteria>();
oredCriteria = new ArrayList<>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @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_accountitem
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class AccountItemExample {
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @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_accountitem
*
* @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_accountitem
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -196,372 +106,372 @@ public class AccountItemExample {
}
public Criteria andIdIsNull() {
addCriterion("Id is null");
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("Id is not null");
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id");
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id");
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id");
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id");
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id");
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id");
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id");
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id");
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id");
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id");
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andHeaderidIsNull() {
addCriterion("HeaderId is null");
public Criteria andHeaderIdIsNull() {
addCriterion("header_id is null");
return (Criteria) this;
}
public Criteria andHeaderidIsNotNull() {
addCriterion("HeaderId is not null");
public Criteria andHeaderIdIsNotNull() {
addCriterion("header_id is not null");
return (Criteria) this;
}
public Criteria andHeaderidEqualTo(Long value) {
addCriterion("HeaderId =", value, "headerid");
public Criteria andHeaderIdEqualTo(Long value) {
addCriterion("header_id =", value, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidNotEqualTo(Long value) {
addCriterion("HeaderId <>", value, "headerid");
public Criteria andHeaderIdNotEqualTo(Long value) {
addCriterion("header_id <>", value, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidGreaterThan(Long value) {
addCriterion("HeaderId >", value, "headerid");
public Criteria andHeaderIdGreaterThan(Long value) {
addCriterion("header_id >", value, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidGreaterThanOrEqualTo(Long value) {
addCriterion("HeaderId >=", value, "headerid");
public Criteria andHeaderIdGreaterThanOrEqualTo(Long value) {
addCriterion("header_id >=", value, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidLessThan(Long value) {
addCriterion("HeaderId <", value, "headerid");
public Criteria andHeaderIdLessThan(Long value) {
addCriterion("header_id <", value, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidLessThanOrEqualTo(Long value) {
addCriterion("HeaderId <=", value, "headerid");
public Criteria andHeaderIdLessThanOrEqualTo(Long value) {
addCriterion("header_id <=", value, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidIn(List<Long> values) {
addCriterion("HeaderId in", values, "headerid");
public Criteria andHeaderIdIn(List<Long> values) {
addCriterion("header_id in", values, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidNotIn(List<Long> values) {
addCriterion("HeaderId not in", values, "headerid");
public Criteria andHeaderIdNotIn(List<Long> values) {
addCriterion("header_id not in", values, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidBetween(Long value1, Long value2) {
addCriterion("HeaderId between", value1, value2, "headerid");
public Criteria andHeaderIdBetween(Long value1, Long value2) {
addCriterion("header_id between", value1, value2, "headerId");
return (Criteria) this;
}
public Criteria andHeaderidNotBetween(Long value1, Long value2) {
addCriterion("HeaderId not between", value1, value2, "headerid");
public Criteria andHeaderIdNotBetween(Long value1, Long value2) {
addCriterion("header_id not between", value1, value2, "headerId");
return (Criteria) this;
}
public Criteria andAccountidIsNull() {
addCriterion("AccountId is null");
public Criteria andAccountIdIsNull() {
addCriterion("account_id is null");
return (Criteria) this;
}
public Criteria andAccountidIsNotNull() {
addCriterion("AccountId is not null");
public Criteria andAccountIdIsNotNull() {
addCriterion("account_id is not null");
return (Criteria) this;
}
public Criteria andAccountidEqualTo(Long value) {
addCriterion("AccountId =", value, "accountid");
public Criteria andAccountIdEqualTo(Long value) {
addCriterion("account_id =", value, "accountId");
return (Criteria) this;
}
public Criteria andAccountidNotEqualTo(Long value) {
addCriterion("AccountId <>", value, "accountid");
public Criteria andAccountIdNotEqualTo(Long value) {
addCriterion("account_id <>", value, "accountId");
return (Criteria) this;
}
public Criteria andAccountidGreaterThan(Long value) {
addCriterion("AccountId >", value, "accountid");
public Criteria andAccountIdGreaterThan(Long value) {
addCriterion("account_id >", value, "accountId");
return (Criteria) this;
}
public Criteria andAccountidGreaterThanOrEqualTo(Long value) {
addCriterion("AccountId >=", value, "accountid");
public Criteria andAccountIdGreaterThanOrEqualTo(Long value) {
addCriterion("account_id >=", value, "accountId");
return (Criteria) this;
}
public Criteria andAccountidLessThan(Long value) {
addCriterion("AccountId <", value, "accountid");
public Criteria andAccountIdLessThan(Long value) {
addCriterion("account_id <", value, "accountId");
return (Criteria) this;
}
public Criteria andAccountidLessThanOrEqualTo(Long value) {
addCriterion("AccountId <=", value, "accountid");
public Criteria andAccountIdLessThanOrEqualTo(Long value) {
addCriterion("account_id <=", value, "accountId");
return (Criteria) this;
}
public Criteria andAccountidIn(List<Long> values) {
addCriterion("AccountId in", values, "accountid");
public Criteria andAccountIdIn(List<Long> values) {
addCriterion("account_id in", values, "accountId");
return (Criteria) this;
}
public Criteria andAccountidNotIn(List<Long> values) {
addCriterion("AccountId not in", values, "accountid");
public Criteria andAccountIdNotIn(List<Long> values) {
addCriterion("account_id not in", values, "accountId");
return (Criteria) this;
}
public Criteria andAccountidBetween(Long value1, Long value2) {
addCriterion("AccountId between", value1, value2, "accountid");
public Criteria andAccountIdBetween(Long value1, Long value2) {
addCriterion("account_id between", value1, value2, "accountId");
return (Criteria) this;
}
public Criteria andAccountidNotBetween(Long value1, Long value2) {
addCriterion("AccountId not between", value1, value2, "accountid");
public Criteria andAccountIdNotBetween(Long value1, Long value2) {
addCriterion("account_id not between", value1, value2, "accountId");
return (Criteria) this;
}
public Criteria andInoutitemidIsNull() {
addCriterion("InOutItemId is null");
public Criteria andInOutItemIdIsNull() {
addCriterion("in_out_item_id is null");
return (Criteria) this;
}
public Criteria andInoutitemidIsNotNull() {
addCriterion("InOutItemId is not null");
public Criteria andInOutItemIdIsNotNull() {
addCriterion("in_out_item_id is not null");
return (Criteria) this;
}
public Criteria andInoutitemidEqualTo(Long value) {
addCriterion("InOutItemId =", value, "inoutitemid");
public Criteria andInOutItemIdEqualTo(Long value) {
addCriterion("in_out_item_id =", value, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidNotEqualTo(Long value) {
addCriterion("InOutItemId <>", value, "inoutitemid");
public Criteria andInOutItemIdNotEqualTo(Long value) {
addCriterion("in_out_item_id <>", value, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidGreaterThan(Long value) {
addCriterion("InOutItemId >", value, "inoutitemid");
public Criteria andInOutItemIdGreaterThan(Long value) {
addCriterion("in_out_item_id >", value, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidGreaterThanOrEqualTo(Long value) {
addCriterion("InOutItemId >=", value, "inoutitemid");
public Criteria andInOutItemIdGreaterThanOrEqualTo(Long value) {
addCriterion("in_out_item_id >=", value, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidLessThan(Long value) {
addCriterion("InOutItemId <", value, "inoutitemid");
public Criteria andInOutItemIdLessThan(Long value) {
addCriterion("in_out_item_id <", value, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidLessThanOrEqualTo(Long value) {
addCriterion("InOutItemId <=", value, "inoutitemid");
public Criteria andInOutItemIdLessThanOrEqualTo(Long value) {
addCriterion("in_out_item_id <=", value, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidIn(List<Long> values) {
addCriterion("InOutItemId in", values, "inoutitemid");
public Criteria andInOutItemIdIn(List<Long> values) {
addCriterion("in_out_item_id in", values, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidNotIn(List<Long> values) {
addCriterion("InOutItemId not in", values, "inoutitemid");
public Criteria andInOutItemIdNotIn(List<Long> values) {
addCriterion("in_out_item_id not in", values, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidBetween(Long value1, Long value2) {
addCriterion("InOutItemId between", value1, value2, "inoutitemid");
public Criteria andInOutItemIdBetween(Long value1, Long value2) {
addCriterion("in_out_item_id between", value1, value2, "inOutItemId");
return (Criteria) this;
}
public Criteria andInoutitemidNotBetween(Long value1, Long value2) {
addCriterion("InOutItemId not between", value1, value2, "inoutitemid");
public Criteria andInOutItemIdNotBetween(Long value1, Long value2) {
addCriterion("in_out_item_id not between", value1, value2, "inOutItemId");
return (Criteria) this;
}
public Criteria andEachamountIsNull() {
addCriterion("EachAmount is null");
public Criteria andEachAmountIsNull() {
addCriterion("each_amount is null");
return (Criteria) this;
}
public Criteria andEachamountIsNotNull() {
addCriterion("EachAmount is not null");
public Criteria andEachAmountIsNotNull() {
addCriterion("each_amount is not null");
return (Criteria) this;
}
public Criteria andEachamountEqualTo(BigDecimal value) {
addCriterion("EachAmount =", value, "eachamount");
public Criteria andEachAmountEqualTo(BigDecimal value) {
addCriterion("each_amount =", value, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountNotEqualTo(BigDecimal value) {
addCriterion("EachAmount <>", value, "eachamount");
public Criteria andEachAmountNotEqualTo(BigDecimal value) {
addCriterion("each_amount <>", value, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountGreaterThan(BigDecimal value) {
addCriterion("EachAmount >", value, "eachamount");
public Criteria andEachAmountGreaterThan(BigDecimal value) {
addCriterion("each_amount >", value, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("EachAmount >=", value, "eachamount");
public Criteria andEachAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("each_amount >=", value, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountLessThan(BigDecimal value) {
addCriterion("EachAmount <", value, "eachamount");
public Criteria andEachAmountLessThan(BigDecimal value) {
addCriterion("each_amount <", value, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountLessThanOrEqualTo(BigDecimal value) {
addCriterion("EachAmount <=", value, "eachamount");
public Criteria andEachAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("each_amount <=", value, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountIn(List<BigDecimal> values) {
addCriterion("EachAmount in", values, "eachamount");
public Criteria andEachAmountIn(List<BigDecimal> values) {
addCriterion("each_amount in", values, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountNotIn(List<BigDecimal> values) {
addCriterion("EachAmount not in", values, "eachamount");
public Criteria andEachAmountNotIn(List<BigDecimal> values) {
addCriterion("each_amount not in", values, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("EachAmount between", value1, value2, "eachamount");
public Criteria andEachAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("each_amount between", value1, value2, "eachAmount");
return (Criteria) this;
}
public Criteria andEachamountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("EachAmount not between", value1, value2, "eachamount");
public Criteria andEachAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("each_amount not between", value1, value2, "eachAmount");
return (Criteria) this;
}
public Criteria andRemarkIsNull() {
addCriterion("Remark is null");
addCriterion("remark is null");
return (Criteria) this;
}
public Criteria andRemarkIsNotNull() {
addCriterion("Remark is not null");
addCriterion("remark is not null");
return (Criteria) this;
}
public Criteria andRemarkEqualTo(String value) {
addCriterion("Remark =", value, "remark");
addCriterion("remark =", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotEqualTo(String value) {
addCriterion("Remark <>", value, "remark");
addCriterion("remark <>", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThan(String value) {
addCriterion("Remark >", value, "remark");
addCriterion("remark >", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("Remark >=", value, "remark");
addCriterion("remark >=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThan(String value) {
addCriterion("Remark <", value, "remark");
addCriterion("remark <", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("Remark <=", value, "remark");
addCriterion("remark <=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLike(String value) {
addCriterion("Remark like", value, "remark");
addCriterion("remark like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotLike(String value) {
addCriterion("Remark not like", value, "remark");
addCriterion("remark not like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkIn(List<String> values) {
addCriterion("Remark in", values, "remark");
addCriterion("remark in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotIn(List<String> values) {
addCriterion("Remark not in", values, "remark");
addCriterion("remark not in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("Remark between", value1, value2, "remark");
addCriterion("remark between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("Remark not between", value1, value2, "remark");
addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this;
}
@@ -626,95 +536,82 @@ public class AccountItemExample {
}
public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null");
addCriterion("delete_flag is null");
return (Criteria) this;
}
public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null");
addCriterion("delete_flag is not null");
return (Criteria) this;
}
public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag");
addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag");
addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag");
addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
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");
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_accountitem
*
* @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_accountitem
*
* @mbggenerated
*/
public static class Criterion {
private String condition;

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

@@ -8,55 +8,55 @@ public class DepotHead {
private String type;
private String subtype;
private String subType;
private String defaultnumber;
private String defaultNumber;
private String number;
private String operpersonname;
private String operPersonName;
private Date createtime;
private Date createTime;
private Date opertime;
private Date operTime;
private Long organid;
private Long organId;
private Long handspersonid;
private Long handsPersonId;
private Long accountid;
private Long accountId;
private BigDecimal changeamount;
private BigDecimal changeAmount;
private BigDecimal totalprice;
private BigDecimal totalPrice;
private String paytype;
private String payType;
private String remark;
private String salesman;
private String salesMan;
private String accountidlist;
private String accountIdList;
private String accountmoneylist;
private String accountMoneyList;
private BigDecimal discount;
private BigDecimal discountmoney;
private BigDecimal discountMoney;
private BigDecimal discountlastmoney;
private BigDecimal discountLastMoney;
private BigDecimal othermoney;
private BigDecimal otherMoney;
private String othermoneylist;
private String otherMoneyList;
private String othermoneyitem;
private String otherMoneyItem;
private Integer accountday;
private Integer accountDay;
private String status;
private String linknumber;
private String linkNumber;
private Long tenantId;
@@ -78,20 +78,20 @@ public class DepotHead {
this.type = type == null ? null : type.trim();
}
public String getSubtype() {
return subtype;
public String getSubType() {
return subType;
}
public void setSubtype(String subtype) {
this.subtype = subtype == null ? null : subtype.trim();
public void setSubType(String subType) {
this.subType = subType == null ? null : subType.trim();
}
public String getDefaultnumber() {
return defaultnumber;
public String getDefaultNumber() {
return defaultNumber;
}
public void setDefaultnumber(String defaultnumber) {
this.defaultnumber = defaultnumber == null ? null : defaultnumber.trim();
public void setDefaultNumber(String defaultNumber) {
this.defaultNumber = defaultNumber == null ? null : defaultNumber.trim();
}
public String getNumber() {
@@ -102,76 +102,76 @@ public class DepotHead {
this.number = number == null ? null : number.trim();
}
public String getOperpersonname() {
return operpersonname;
public String getOperPersonName() {
return operPersonName;
}
public void setOperpersonname(String operpersonname) {
this.operpersonname = operpersonname == null ? null : operpersonname.trim();
public void setOperPersonName(String operPersonName) {
this.operPersonName = operPersonName == null ? null : operPersonName.trim();
}
public Date getCreatetime() {
return createtime;
public Date getCreateTime() {
return createTime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getOpertime() {
return opertime;
public Date getOperTime() {
return operTime;
}
public void setOpertime(Date opertime) {
this.opertime = opertime;
public void setOperTime(Date operTime) {
this.operTime = operTime;
}
public Long getOrganid() {
return organid;
public Long getOrganId() {
return organId;
}
public void setOrganid(Long organid) {
this.organid = organid;
public void setOrganId(Long organId) {
this.organId = organId;
}
public Long getHandspersonid() {
return handspersonid;
public Long getHandsPersonId() {
return handsPersonId;
}
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
public void setHandsPersonId(Long handsPersonId) {
this.handsPersonId = handsPersonId;
}
public Long getAccountid() {
return accountid;
public Long getAccountId() {
return accountId;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public BigDecimal getChangeamount() {
return changeamount;
public BigDecimal getChangeAmount() {
return changeAmount;
}
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
public BigDecimal getTotalprice() {
return totalprice;
public BigDecimal getTotalPrice() {
return totalPrice;
}
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
public void setTotalPrice(BigDecimal totalPrice) {
this.totalPrice = totalPrice;
}
public String getPaytype() {
return paytype;
public String getPayType() {
return payType;
}
public void setPaytype(String paytype) {
this.paytype = paytype == null ? null : paytype.trim();
public void setPayType(String payType) {
this.payType = payType == null ? null : payType.trim();
}
public String getRemark() {
@@ -182,28 +182,28 @@ public class DepotHead {
this.remark = remark == null ? null : remark.trim();
}
public String getSalesman() {
return salesman;
public String getSalesMan() {
return salesMan;
}
public void setSalesman(String salesman) {
this.salesman = salesman == null ? null : salesman.trim();
public void setSalesMan(String salesMan) {
this.salesMan = salesMan == null ? null : salesMan.trim();
}
public String getAccountidlist() {
return accountidlist;
public String getAccountIdList() {
return accountIdList;
}
public void setAccountidlist(String accountidlist) {
this.accountidlist = accountidlist == null ? null : accountidlist.trim();
public void setAccountIdList(String accountIdList) {
this.accountIdList = accountIdList == null ? null : accountIdList.trim();
}
public String getAccountmoneylist() {
return accountmoneylist;
public String getAccountMoneyList() {
return accountMoneyList;
}
public void setAccountmoneylist(String accountmoneylist) {
this.accountmoneylist = accountmoneylist == null ? null : accountmoneylist.trim();
public void setAccountMoneyList(String accountMoneyList) {
this.accountMoneyList = accountMoneyList == null ? null : accountMoneyList.trim();
}
public BigDecimal getDiscount() {
@@ -214,52 +214,52 @@ public class DepotHead {
this.discount = discount;
}
public BigDecimal getDiscountmoney() {
return discountmoney;
public BigDecimal getDiscountMoney() {
return discountMoney;
}
public void setDiscountmoney(BigDecimal discountmoney) {
this.discountmoney = discountmoney;
public void setDiscountMoney(BigDecimal discountMoney) {
this.discountMoney = discountMoney;
}
public BigDecimal getDiscountlastmoney() {
return discountlastmoney;
public BigDecimal getDiscountLastMoney() {
return discountLastMoney;
}
public void setDiscountlastmoney(BigDecimal discountlastmoney) {
this.discountlastmoney = discountlastmoney;
public void setDiscountLastMoney(BigDecimal discountLastMoney) {
this.discountLastMoney = discountLastMoney;
}
public BigDecimal getOthermoney() {
return othermoney;
public BigDecimal getOtherMoney() {
return otherMoney;
}
public void setOthermoney(BigDecimal othermoney) {
this.othermoney = othermoney;
public void setOtherMoney(BigDecimal otherMoney) {
this.otherMoney = otherMoney;
}
public String getOthermoneylist() {
return othermoneylist;
public String getOtherMoneyList() {
return otherMoneyList;
}
public void setOthermoneylist(String othermoneylist) {
this.othermoneylist = othermoneylist == null ? null : othermoneylist.trim();
public void setOtherMoneyList(String otherMoneyList) {
this.otherMoneyList = otherMoneyList == null ? null : otherMoneyList.trim();
}
public String getOthermoneyitem() {
return othermoneyitem;
public String getOtherMoneyItem() {
return otherMoneyItem;
}
public void setOthermoneyitem(String othermoneyitem) {
this.othermoneyitem = othermoneyitem == null ? null : othermoneyitem.trim();
public void setOtherMoneyItem(String otherMoneyItem) {
this.otherMoneyItem = otherMoneyItem == null ? null : otherMoneyItem.trim();
}
public Integer getAccountday() {
return accountday;
public Integer getAccountDay() {
return accountDay;
}
public void setAccountday(Integer accountday) {
this.accountday = accountday;
public void setAccountDay(Integer accountDay) {
this.accountDay = accountDay;
}
public String getStatus() {
@@ -270,12 +270,12 @@ public class DepotHead {
this.status = status == null ? null : status.trim();
}
public String getLinknumber() {
return linknumber;
public String getLinkNumber() {
return linkNumber;
}
public void setLinknumber(String linknumber) {
this.linknumber = linknumber == null ? null : linknumber.trim();
public void setLinkNumber(String linkNumber) {
this.linkNumber = linkNumber == null ? null : linkNumber.trim();
}
public Long getTenantId() {

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

File diff suppressed because it is too large Load Diff

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

@@ -5,23 +5,23 @@ import java.math.BigDecimal;
public class DepotItem {
private Long id;
private Long headerid;
private Long headerId;
private Long materialid;
private Long materialId;
private Long materialExtendId;
private String munit;
private String materialUnit;
private BigDecimal opernumber;
private BigDecimal operNumber;
private BigDecimal basicnumber;
private BigDecimal basicNumber;
private BigDecimal unitprice;
private BigDecimal unitPrice;
private BigDecimal taxunitprice;
private BigDecimal taxUnitPrice;
private BigDecimal allprice;
private BigDecimal allPrice;
private String remark;
@@ -29,27 +29,27 @@ public class DepotItem {
private BigDecimal incidentals;
private Long depotid;
private Long depotId;
private Long anotherdepotid;
private Long anotherDepotId;
private BigDecimal taxrate;
private BigDecimal taxRate;
private BigDecimal taxmoney;
private BigDecimal taxMoney;
private BigDecimal taxlastmoney;
private BigDecimal taxLastMoney;
private String otherfield1;
private String otherField1;
private String otherfield2;
private String otherField2;
private String otherfield3;
private String otherField3;
private String otherfield4;
private String otherField4;
private String otherfield5;
private String otherField5;
private String mtype;
private String materialType;
private Long tenantId;
@@ -63,20 +63,20 @@ public class DepotItem {
this.id = id;
}
public Long getHeaderid() {
return headerid;
public Long getHeaderId() {
return headerId;
}
public void setHeaderid(Long headerid) {
this.headerid = headerid;
public void setHeaderId(Long headerId) {
this.headerId = headerId;
}
public Long getMaterialid() {
return materialid;
public Long getMaterialId() {
return materialId;
}
public void setMaterialid(Long materialid) {
this.materialid = materialid;
public void setMaterialId(Long materialId) {
this.materialId = materialId;
}
public Long getMaterialExtendId() {
@@ -87,52 +87,52 @@ public class DepotItem {
this.materialExtendId = materialExtendId;
}
public String getMunit() {
return munit;
public String getMaterialUnit() {
return materialUnit;
}
public void setMunit(String munit) {
this.munit = munit == null ? null : munit.trim();
public void setMaterialUnit(String materialUnit) {
this.materialUnit = materialUnit == null ? null : materialUnit.trim();
}
public BigDecimal getOpernumber() {
return opernumber;
public BigDecimal getOperNumber() {
return operNumber;
}
public void setOpernumber(BigDecimal opernumber) {
this.opernumber = opernumber;
public void setOperNumber(BigDecimal operNumber) {
this.operNumber = operNumber;
}
public BigDecimal getBasicnumber() {
return basicnumber;
public BigDecimal getBasicNumber() {
return basicNumber;
}
public void setBasicnumber(BigDecimal basicnumber) {
this.basicnumber = basicnumber;
public void setBasicNumber(BigDecimal basicNumber) {
this.basicNumber = basicNumber;
}
public BigDecimal getUnitprice() {
return unitprice;
public BigDecimal getUnitPrice() {
return unitPrice;
}
public void setUnitprice(BigDecimal unitprice) {
this.unitprice = unitprice;
public void setUnitPrice(BigDecimal unitPrice) {
this.unitPrice = unitPrice;
}
public BigDecimal getTaxunitprice() {
return taxunitprice;
public BigDecimal getTaxUnitPrice() {
return taxUnitPrice;
}
public void setTaxunitprice(BigDecimal taxunitprice) {
this.taxunitprice = taxunitprice;
public void setTaxUnitPrice(BigDecimal taxUnitPrice) {
this.taxUnitPrice = taxUnitPrice;
}
public BigDecimal getAllprice() {
return allprice;
public BigDecimal getAllPrice() {
return allPrice;
}
public void setAllprice(BigDecimal allprice) {
this.allprice = allprice;
public void setAllPrice(BigDecimal allPrice) {
this.allPrice = allPrice;
}
public String getRemark() {
@@ -159,92 +159,92 @@ public class DepotItem {
this.incidentals = incidentals;
}
public Long getDepotid() {
return depotid;
public Long getDepotId() {
return depotId;
}
public void setDepotid(Long depotid) {
this.depotid = depotid;
public void setDepotId(Long depotId) {
this.depotId = depotId;
}
public Long getAnotherdepotid() {
return anotherdepotid;
public Long getAnotherDepotId() {
return anotherDepotId;
}
public void setAnotherdepotid(Long anotherdepotid) {
this.anotherdepotid = anotherdepotid;
public void setAnotherDepotId(Long anotherDepotId) {
this.anotherDepotId = anotherDepotId;
}
public BigDecimal getTaxrate() {
return taxrate;
public BigDecimal getTaxRate() {
return taxRate;
}
public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate;
public void setTaxRate(BigDecimal taxRate) {
this.taxRate = taxRate;
}
public BigDecimal getTaxmoney() {
return taxmoney;
public BigDecimal getTaxMoney() {
return taxMoney;
}
public void setTaxmoney(BigDecimal taxmoney) {
this.taxmoney = taxmoney;
public void setTaxMoney(BigDecimal taxMoney) {
this.taxMoney = taxMoney;
}
public BigDecimal getTaxlastmoney() {
return taxlastmoney;
public BigDecimal getTaxLastMoney() {
return taxLastMoney;
}
public void setTaxlastmoney(BigDecimal taxlastmoney) {
this.taxlastmoney = taxlastmoney;
public void setTaxLastMoney(BigDecimal taxLastMoney) {
this.taxLastMoney = taxLastMoney;
}
public String getOtherfield1() {
return otherfield1;
public String getOtherField1() {
return otherField1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1 == null ? null : otherfield1.trim();
public void setOtherField1(String otherField1) {
this.otherField1 = otherField1 == null ? null : otherField1.trim();
}
public String getOtherfield2() {
return otherfield2;
public String getOtherField2() {
return otherField2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2 == null ? null : otherfield2.trim();
public void setOtherField2(String otherField2) {
this.otherField2 = otherField2 == null ? null : otherField2.trim();
}
public String getOtherfield3() {
return otherfield3;
public String getOtherField3() {
return otherField3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
public void setOtherField3(String otherField3) {
this.otherField3 = otherField3 == null ? null : otherField3.trim();
}
public String getOtherfield4() {
return otherfield4;
public String getOtherField4() {
return otherField4;
}
public void setOtherfield4(String otherfield4) {
this.otherfield4 = otherfield4 == null ? null : otherfield4.trim();
public void setOtherField4(String otherField4) {
this.otherField4 = otherField4 == null ? null : otherField4.trim();
}
public String getOtherfield5() {
return otherfield5;
public String getOtherField5() {
return otherField5;
}
public void setOtherfield5(String otherfield5) {
this.otherfield5 = otherfield5 == null ? null : otherfield5.trim();
public void setOtherField5(String otherField5) {
this.otherField5 = otherField5 == null ? null : otherField5.trim();
}
public String getMtype() {
return mtype;
public String getMaterialType() {
return materialType;
}
public void setMtype(String mtype) {
this.mtype = mtype == null ? null : mtype.trim();
public void setMaterialType(String materialType) {
this.materialType = materialType == null ? null : materialType.trim();
}
public Long getTenantId() {

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

File diff suppressed because it is too large Load Diff

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

@@ -5,13 +5,13 @@ import java.math.BigDecimal;
public class Material {
private Long id;
private Long categoryid;
private Long categoryId;
private String name;
private String mfrs;
private BigDecimal safetystock;
private BigDecimal safetyStock;
private String model;
@@ -23,17 +23,17 @@ public class Material {
private String remark;
private Long unitid;
private Long unitId;
private Boolean enabled;
private String otherfield1;
private String otherField1;
private String otherfield2;
private String otherField2;
private String otherfield3;
private String otherField3;
private String enableserialnumber;
private String enableSerialNumber;
private Long tenantId;
@@ -47,12 +47,12 @@ public class Material {
this.id = id;
}
public Long getCategoryid() {
return categoryid;
public Long getCategoryId() {
return categoryId;
}
public void setCategoryid(Long categoryid) {
this.categoryid = categoryid;
public void setCategoryId(Long categoryId) {
this.categoryId = categoryId;
}
public String getName() {
@@ -71,12 +71,12 @@ public class Material {
this.mfrs = mfrs == null ? null : mfrs.trim();
}
public BigDecimal getSafetystock() {
return safetystock;
public BigDecimal getSafetyStock() {
return safetyStock;
}
public void setSafetystock(BigDecimal safetystock) {
this.safetystock = safetystock;
public void setSafetyStock(BigDecimal safetyStock) {
this.safetyStock = safetyStock;
}
public String getModel() {
@@ -119,12 +119,12 @@ public class Material {
this.remark = remark == null ? null : remark.trim();
}
public Long getUnitid() {
return unitid;
public Long getUnitId() {
return unitId;
}
public void setUnitid(Long unitid) {
this.unitid = unitid;
public void setUnitId(Long unitId) {
this.unitId = unitId;
}
public Boolean getEnabled() {
@@ -135,36 +135,36 @@ public class Material {
this.enabled = enabled;
}
public String getOtherfield1() {
return otherfield1;
public String getOtherField1() {
return otherField1;
}
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1 == null ? null : otherfield1.trim();
public void setOtherField1(String otherField1) {
this.otherField1 = otherField1 == null ? null : otherField1.trim();
}
public String getOtherfield2() {
return otherfield2;
public String getOtherField2() {
return otherField2;
}
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2 == null ? null : otherfield2.trim();
public void setOtherField2(String otherField2) {
this.otherField2 = otherField2 == null ? null : otherField2.trim();
}
public String getOtherfield3() {
return otherfield3;
public String getOtherField3() {
return otherField3;
}
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
public void setOtherField3(String otherField3) {
this.otherField3 = otherField3 == null ? null : otherField3.trim();
}
public String getEnableserialnumber() {
return enableserialnumber;
public String getEnableSerialNumber() {
return enableSerialNumber;
}
public void setEnableserialnumber(String enableserialnumber) {
this.enableserialnumber = enableserialnumber == null ? null : enableserialnumber.trim();
public void setEnableSerialNumber(String enableSerialNumber) {
this.enableSerialNumber = enableSerialNumber == null ? null : enableSerialNumber.trim();
}
public Long getTenantId() {

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

File diff suppressed because it is too large Load Diff

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

@@ -3,738 +3,232 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Supplier {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.supplier
*
* @mbggenerated
*/
private String supplier;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.contacts
*
* @mbggenerated
*/
private String contacts;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.phonenum
*
* @mbggenerated
*/
private String phonenum;
private String phoneNum;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.email
*
* @mbggenerated
*/
private String email;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.description
*
* @mbggenerated
*/
private String description;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.isystem
*
* @mbggenerated
*/
private Byte isystem;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.enabled
*
* @mbggenerated
*/
private Boolean enabled;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.AdvanceIn
*
* @mbggenerated
*/
private BigDecimal advancein;
private BigDecimal advanceIn;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.BeginNeedGet
*
* @mbggenerated
*/
private BigDecimal beginneedget;
private BigDecimal beginNeedGet;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.BeginNeedPay
*
* @mbggenerated
*/
private BigDecimal beginneedpay;
private BigDecimal beginNeedPay;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.AllNeedGet
*
* @mbggenerated
*/
private BigDecimal allneedget;
private BigDecimal allNeedGet;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.AllNeedPay
*
* @mbggenerated
*/
private BigDecimal allneedpay;
private BigDecimal allNeedPay;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.fax
*
* @mbggenerated
*/
private String fax;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.telephone
*
* @mbggenerated
*/
private String telephone;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.address
*
* @mbggenerated
*/
private String address;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.taxNum
*
* @mbggenerated
*/
private String taxnum;
private String taxNum;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.bankName
*
* @mbggenerated
*/
private String bankname;
private String bankName;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.accountNumber
*
* @mbggenerated
*/
private String accountnumber;
private String accountNumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.taxRate
*
* @mbggenerated
*/
private BigDecimal taxrate;
private BigDecimal taxRate;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_supplier.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.id
*
* @return the value of jsh_supplier.id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.id
*
* @param id the value for jsh_supplier.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_supplier.supplier
*
* @return the value of jsh_supplier.supplier
*
* @mbggenerated
*/
public String getSupplier() {
return supplier;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.supplier
*
* @param supplier the value for jsh_supplier.supplier
*
* @mbggenerated
*/
public void setSupplier(String supplier) {
this.supplier = supplier == null ? null : supplier.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.contacts
*
* @return the value of jsh_supplier.contacts
*
* @mbggenerated
*/
public String getContacts() {
return contacts;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.contacts
*
* @param contacts the value for jsh_supplier.contacts
*
* @mbggenerated
*/
public void setContacts(String contacts) {
this.contacts = contacts == null ? null : contacts.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.phonenum
*
* @return the value of jsh_supplier.phonenum
*
* @mbggenerated
*/
public String getPhonenum() {
return phonenum;
public String getPhoneNum() {
return phoneNum;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.phonenum
*
* @param phonenum the value for jsh_supplier.phonenum
*
* @mbggenerated
*/
public void setPhonenum(String phonenum) {
this.phonenum = phonenum == null ? null : phonenum.trim();
public void setPhoneNum(String phoneNum) {
this.phoneNum = phoneNum == null ? null : phoneNum.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.email
*
* @return the value of jsh_supplier.email
*
* @mbggenerated
*/
public String getEmail() {
return email;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.email
*
* @param email the value for jsh_supplier.email
*
* @mbggenerated
*/
public void setEmail(String email) {
this.email = email == null ? null : email.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.description
*
* @return the value of jsh_supplier.description
*
* @mbggenerated
*/
public String getDescription() {
return description;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.description
*
* @param description the value for jsh_supplier.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_supplier.isystem
*
* @return the value of jsh_supplier.isystem
*
* @mbggenerated
*/
public Byte getIsystem() {
return isystem;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.isystem
*
* @param isystem the value for jsh_supplier.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_supplier.type
*
* @return the value of jsh_supplier.type
*
* @mbggenerated
*/
public String getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.type
*
* @param type the value for jsh_supplier.type
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.enabled
*
* @return the value of jsh_supplier.enabled
*
* @mbggenerated
*/
public Boolean getEnabled() {
return enabled;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.enabled
*
* @param enabled the value for jsh_supplier.enabled
*
* @mbggenerated
*/
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.AdvanceIn
*
* @return the value of jsh_supplier.AdvanceIn
*
* @mbggenerated
*/
public BigDecimal getAdvancein() {
return advancein;
public BigDecimal getAdvanceIn() {
return advanceIn;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.AdvanceIn
*
* @param advancein the value for jsh_supplier.AdvanceIn
*
* @mbggenerated
*/
public void setAdvancein(BigDecimal advancein) {
this.advancein = advancein;
public void setAdvanceIn(BigDecimal advanceIn) {
this.advanceIn = advanceIn;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.BeginNeedGet
*
* @return the value of jsh_supplier.BeginNeedGet
*
* @mbggenerated
*/
public BigDecimal getBeginneedget() {
return beginneedget;
public BigDecimal getBeginNeedGet() {
return beginNeedGet;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.BeginNeedGet
*
* @param beginneedget the value for jsh_supplier.BeginNeedGet
*
* @mbggenerated
*/
public void setBeginneedget(BigDecimal beginneedget) {
this.beginneedget = beginneedget;
public void setBeginNeedGet(BigDecimal beginNeedGet) {
this.beginNeedGet = beginNeedGet;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.BeginNeedPay
*
* @return the value of jsh_supplier.BeginNeedPay
*
* @mbggenerated
*/
public BigDecimal getBeginneedpay() {
return beginneedpay;
public BigDecimal getBeginNeedPay() {
return beginNeedPay;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.BeginNeedPay
*
* @param beginneedpay the value for jsh_supplier.BeginNeedPay
*
* @mbggenerated
*/
public void setBeginneedpay(BigDecimal beginneedpay) {
this.beginneedpay = beginneedpay;
public void setBeginNeedPay(BigDecimal beginNeedPay) {
this.beginNeedPay = beginNeedPay;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.AllNeedGet
*
* @return the value of jsh_supplier.AllNeedGet
*
* @mbggenerated
*/
public BigDecimal getAllneedget() {
return allneedget;
public BigDecimal getAllNeedGet() {
return allNeedGet;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.AllNeedGet
*
* @param allneedget the value for jsh_supplier.AllNeedGet
*
* @mbggenerated
*/
public void setAllneedget(BigDecimal allneedget) {
this.allneedget = allneedget;
public void setAllNeedGet(BigDecimal allNeedGet) {
this.allNeedGet = allNeedGet;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.AllNeedPay
*
* @return the value of jsh_supplier.AllNeedPay
*
* @mbggenerated
*/
public BigDecimal getAllneedpay() {
return allneedpay;
public BigDecimal getAllNeedPay() {
return allNeedPay;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.AllNeedPay
*
* @param allneedpay the value for jsh_supplier.AllNeedPay
*
* @mbggenerated
*/
public void setAllneedpay(BigDecimal allneedpay) {
this.allneedpay = allneedpay;
public void setAllNeedPay(BigDecimal allNeedPay) {
this.allNeedPay = allNeedPay;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.fax
*
* @return the value of jsh_supplier.fax
*
* @mbggenerated
*/
public String getFax() {
return fax;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.fax
*
* @param fax the value for jsh_supplier.fax
*
* @mbggenerated
*/
public void setFax(String fax) {
this.fax = fax == null ? null : fax.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.telephone
*
* @return the value of jsh_supplier.telephone
*
* @mbggenerated
*/
public String getTelephone() {
return telephone;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.telephone
*
* @param telephone the value for jsh_supplier.telephone
*
* @mbggenerated
*/
public void setTelephone(String telephone) {
this.telephone = telephone == null ? null : telephone.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.address
*
* @return the value of jsh_supplier.address
*
* @mbggenerated
*/
public String getAddress() {
return address;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.address
*
* @param address the value for jsh_supplier.address
*
* @mbggenerated
*/
public void setAddress(String address) {
this.address = address == null ? null : address.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.taxNum
*
* @return the value of jsh_supplier.taxNum
*
* @mbggenerated
*/
public String getTaxnum() {
return taxnum;
public String getTaxNum() {
return taxNum;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.taxNum
*
* @param taxnum the value for jsh_supplier.taxNum
*
* @mbggenerated
*/
public void setTaxnum(String taxnum) {
this.taxnum = taxnum == null ? null : taxnum.trim();
public void setTaxNum(String taxNum) {
this.taxNum = taxNum == null ? null : taxNum.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.bankName
*
* @return the value of jsh_supplier.bankName
*
* @mbggenerated
*/
public String getBankname() {
return bankname;
public String getBankName() {
return bankName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.bankName
*
* @param bankname the value for jsh_supplier.bankName
*
* @mbggenerated
*/
public void setBankname(String bankname) {
this.bankname = bankname == null ? null : bankname.trim();
public void setBankName(String bankName) {
this.bankName = bankName == null ? null : bankName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.accountNumber
*
* @return the value of jsh_supplier.accountNumber
*
* @mbggenerated
*/
public String getAccountnumber() {
return accountnumber;
public String getAccountNumber() {
return accountNumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.accountNumber
*
* @param accountnumber the value for jsh_supplier.accountNumber
*
* @mbggenerated
*/
public void setAccountnumber(String accountnumber) {
this.accountnumber = accountnumber == null ? null : accountnumber.trim();
public void setAccountNumber(String accountNumber) {
this.accountNumber = accountNumber == null ? null : accountNumber.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.taxRate
*
* @return the value of jsh_supplier.taxRate
*
* @mbggenerated
*/
public BigDecimal getTaxrate() {
return taxrate;
public BigDecimal getTaxRate() {
return taxRate;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_supplier.taxRate
*
* @param taxrate the value for jsh_supplier.taxRate
*
* @mbggenerated
*/
public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate;
public void setTaxRate(BigDecimal taxRate) {
this.taxRate = taxRate;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_supplier.tenant_id
*
* @return the value of jsh_supplier.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_supplier.tenant_id
*
* @param tenantId the value for jsh_supplier.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_supplier.delete_Flag
*
* @return the value of jsh_supplier.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_supplier.delete_Flag
*
* @param deleteFlag the value for jsh_supplier.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}

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

File diff suppressed because it is too large Load Diff

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

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface AccountHeadMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int countByExample(AccountHeadExample example);
long countByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insert(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int insertSelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
List<AccountHead> selectByExample(AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
AccountHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByExample(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(AccountHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accounthead
*
* @mbggenerated
*/
int updateByPrimaryKey(AccountHead record);
}

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

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface AccountItemMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int countByExample(AccountItemExample example);
long countByExample(AccountItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int deleteByExample(AccountItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int insert(AccountItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int insertSelective(AccountItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
List<AccountItem> selectByExample(AccountItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
AccountItem selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") AccountItem record, @Param("example") AccountItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int updateByExample(@Param("record") AccountItem record, @Param("example") AccountItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(AccountItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_accountitem
*
* @mbggenerated
*/
int updateByPrimaryKey(AccountItem record);
}

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

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

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

@@ -19,7 +19,7 @@ public class DepotHeadVo4List extends DepotHead{
private String materialsList;
private String opertimeStr;
private String operTimeStr;
public String getProjectName() {
return projectName;
@@ -69,11 +69,11 @@ public class DepotHeadVo4List extends DepotHead{
this.materialsList = materialsList;
}
public String getOpertimeStr() {
return opertimeStr;
public String getOperTimeStr() {
return operTimeStr;
}
public void setOpertimeStr(String opertimeStr) {
this.opertimeStr = opertimeStr;
public void setOperTimeStr(String operTimeStr) {
this.operTimeStr = operTimeStr;
}
}

56
src/main/java/com/jsh/erp/service/account/AccountService.java
View File

@@ -224,15 +224,15 @@ public class AccountService {
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
if (type.equals("month")) {
example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款")
.andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime)
example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款")
.andOperTimeGreaterThanOrEqualTo(bTime).andOperTimeLessThanOrEqualTo(eTime)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
} else if (type.equals("date")) {
example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款")
.andOpertimeLessThanOrEqualTo(mTime).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款")
.andOperTimeLessThanOrEqualTo(mTime).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
}
} else {
example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款")
example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款")
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
}
List<DepotHead> dataList=null;
@@ -243,8 +243,8 @@ public class AccountService {
}
if (dataList != null) {
for (DepotHead depotHead : dataList) {
if(depotHead.getChangeamount()!=null) {
accountSum = accountSum .add(depotHead.getChangeamount()) ;
if(depotHead.getChangeAmount()!=null) {
accountSum = accountSum .add(depotHead.getChangeAmount()) ;
}
}
}
@@ -269,16 +269,16 @@ public class AccountService {
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
if (type.equals("month")) {
example.createCriteria().andAccountidEqualTo(id)
.andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime)
example.createCriteria().andAccountIdEqualTo(id)
.andBillTimeGreaterThanOrEqualTo(bTime).andBillTimeLessThanOrEqualTo(eTime)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
} else if (type.equals("date")) {
example.createCriteria().andAccountidEqualTo(id)
.andBilltimeLessThanOrEqualTo(mTime)
example.createCriteria().andAccountIdEqualTo(id)
.andBillTimeLessThanOrEqualTo(mTime)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
}
} else {
example.createCriteria().andAccountidEqualTo(id)
example.createCriteria().andAccountIdEqualTo(id)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
}
List<AccountHead> dataList=null;
@@ -289,8 +289,8 @@ public class AccountService {
}
if (dataList != null) {
for (AccountHead accountHead : dataList) {
if(accountHead.getChangeamount()!=null) {
accountSum = accountSum.add(accountHead.getChangeamount());
if(accountHead.getChangeAmount()!=null) {
accountSum = accountSum.add(accountHead.getChangeAmount());
}
}
}
@@ -315,10 +315,10 @@ public class AccountService {
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
if (type.equals("month")) {
example.createCriteria().andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime)
example.createCriteria().andBillTimeGreaterThanOrEqualTo(bTime).andBillTimeLessThanOrEqualTo(eTime)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
} else if (type.equals("date")) {
example.createCriteria().andBilltimeLessThanOrEqualTo(mTime)
example.createCriteria().andBillTimeLessThanOrEqualTo(mTime)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
}
}
@@ -339,13 +339,13 @@ public class AccountService {
AccountItemExample exampleAi = new AccountItemExample();
if (!ids.equals("")) {
List<Long> idList = StringUtil.strToLongList(ids);
exampleAi.createCriteria().andAccountidEqualTo(id).andHeaderidIn(idList)
exampleAi.createCriteria().andAccountIdEqualTo(id).andHeaderIdIn(idList)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<AccountItem> dataListOne = accountItemMapper.selectByExample(exampleAi);
if (dataListOne != null) {
for (AccountItem accountItem : dataListOne) {
if(accountItem.getEachamount()!=null) {
accountSum = accountSum.add(accountItem.getEachamount());
if(accountItem.getEachAmount()!=null) {
accountSum = accountSum.add(accountItem.getEachAmount());
}
}
}
@@ -374,16 +374,16 @@ public class AccountService {
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
if (type.equals("month")) {
example.createCriteria().andAccountidlistLike("%" +id.toString() + "%")
.andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime)
example.createCriteria().andAccountIdListLike("%" +id.toString() + "%")
.andOperTimeGreaterThanOrEqualTo(bTime).andOperTimeLessThanOrEqualTo(eTime)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
} else if (type.equals("date")) {
example.createCriteria().andAccountidlistLike("%" +id.toString() + "%")
.andOpertimeLessThanOrEqualTo(mTime)
example.createCriteria().andAccountIdListLike("%" +id.toString() + "%")
.andOperTimeLessThanOrEqualTo(mTime)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
}
} else {
example.createCriteria().andAccountidlistLike("%" +id.toString() + "%")
example.createCriteria().andAccountIdListLike("%" +id.toString() + "%")
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
}
List<DepotHead> dataList=null;
@@ -394,8 +394,8 @@ public class AccountService {
}
if (dataList != null) {
for (DepotHead depotHead : dataList) {
String accountIdList = depotHead.getAccountidlist();
String accountMoneyList = depotHead.getAccountmoneylist();
String accountIdList = depotHead.getAccountIdList();
String accountMoneyList = depotHead.getAccountMoneyList();
if(StringUtil.isNotEmpty(accountIdList) && StringUtil.isNotEmpty(accountMoneyList)) {
accountIdList = accountIdList.replace("[", "").replace("]", "").replace("\"", "");
accountMoneyList = accountMoneyList.replace("[", "").replace("]", "").replace("\"", "");
@@ -488,7 +488,7 @@ public class AccountService {
* 校验：
* 1、财务主表 jsh_accounthead
* 2、财务子表 jsh_accountitem
* 3、单据主表 jsh_depothead
* 3、单据主表 jsh_depot_head
* 是否有相关数据
* */
int deleteTotal=0;
@@ -527,7 +527,7 @@ public class AccountService {
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
}
/**
* 校验单据主表 jsh_depothead
* 校验单据主表 jsh_depot_head
* */
List<DepotHead> depotHeadList =null;
try{

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

@@ -89,13 +89,13 @@ public class AccountHeadService {
}
if (null != list) {
for (AccountHeadVo4ListEx ah : list) {
if(ah.getChangeamount() != null) {
ah.setChangeamount(ah.getChangeamount().abs());
if(ah.getChangeAmount() != null) {
ah.setChangeAmount(ah.getChangeAmount().abs());
}
if(ah.getTotalprice() != null) {
ah.setTotalprice(ah.getTotalprice().abs());
if(ah.getTotalPrice() != null) {
ah.setTotalPrice(ah.getTotalPrice().abs());
}
ah.setBillTimeStr(getCenternTime(ah.getBilltime()));
ah.setBillTimeStr(getCenternTime(ah.getBillTime()));
resList.add(ah);
}
}
@@ -119,7 +119,7 @@ public class AccountHeadService {
try{
result = accountHeadMapper.insertSelective(accountHead);
logService.insertLog("财务",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(accountHead.getBillno()).toString(), request);
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(accountHead.getBillNo()).toString(), request);
}catch(Exception e){
JshException.writeFail(logger, e);
}
@@ -134,7 +134,7 @@ public class AccountHeadService {
try{
result = accountHeadMapper.updateByPrimaryKeySelective(accountHead);
logService.insertLog("财务",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(accountHead.getBillno()).toString(), request);
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(accountHead.getBillNo()).toString(), request);
}catch(Exception e){
JshException.writeFail(logger, e);
}
@@ -148,7 +148,7 @@ public class AccountHeadService {
AccountHead accountHead = accountHeadMapper.selectByPrimaryKey(id);
result = accountHeadMapper.deleteByPrimaryKey(id);
logService.insertLog("财务",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(accountHead.getBillno()).toString(), request);
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(accountHead.getBillNo()).toString(), request);
}catch(Exception e){
JshException.writeFail(logger, e);
}
@@ -195,9 +195,9 @@ public class AccountHeadService {
public BigDecimal findAllMoney(Integer supplierId, String type, String mode, String endTime) {
String modeName = "";
if (mode.equals("实际")) {
modeName = "ChangeAmount";
modeName = "change_amount";
} else if (mode.equals("合计")) {
modeName = "TotalPrice";
modeName = "total_price";
}
BigDecimal result = null;
try{
@@ -268,11 +268,11 @@ public class AccountHeadService {
}
if (null != list) {
for (AccountHeadVo4ListEx ah : list) {
if(ah.getChangeamount() != null) {
ah.setChangeamount(ah.getChangeamount().abs());
if(ah.getChangeAmount() != null) {
ah.setChangeAmount(ah.getChangeAmount().abs());
}
if(ah.getTotalprice() != null) {
ah.setTotalprice(ah.getTotalprice().abs());
if(ah.getTotalPrice() != null) {
ah.setTotalPrice(ah.getTotalPrice().abs());
}
resList.add(ah);
}
@@ -285,7 +285,7 @@ public class AccountHeadService {
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
List<AccountHead> list = getAccountHeadListByIds(ids);
for(AccountHead accountHead: list){
sb.append("[").append(accountHead.getBillno()).append("]");
sb.append("[").append(accountHead.getBillNo()).append("]");
}
logService.insertLog("财务", sb.toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());

20
src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
View File

@@ -201,21 +201,21 @@ public class AccountItemService {
for (int i = 0; i < insertedJson.size(); i++) {
AccountItem accountItem = new AccountItem();
JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
accountItem.setHeaderid(headerId);
accountItem.setHeaderId(headerId);
if (tempInsertedJson.get("AccountId") != null && !tempInsertedJson.get("AccountId").equals("")) {
accountItem.setAccountid(tempInsertedJson.getLong("AccountId"));
accountItem.setAccountId(tempInsertedJson.getLong("AccountId"));
}
if (tempInsertedJson.get("InOutItemId") != null && !tempInsertedJson.get("InOutItemId").equals("")) {
accountItem.setInoutitemid(tempInsertedJson.getLong("InOutItemId"));
accountItem.setInOutItemId(tempInsertedJson.getLong("InOutItemId"));
}
if (tempInsertedJson.get("EachAmount") != null && !tempInsertedJson.get("EachAmount").equals("")) {
BigDecimal eachAmount = tempInsertedJson.getBigDecimal("EachAmount");
if (listType.equals("付款")) {
eachAmount = BigDecimal.ZERO.subtract(eachAmount);
}
accountItem.setEachamount(eachAmount);
accountItem.setEachAmount(eachAmount);
} else {
accountItem.setEachamount(BigDecimal.ZERO);
accountItem.setEachAmount(BigDecimal.ZERO);
}
accountItem.setRemark(tempInsertedJson.getString("Remark"));
this.insertAccountItemWithObj(accountItem);
@@ -238,21 +238,21 @@ public class AccountItemService {
JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i));
AccountItem accountItem = this.getAccountItem(tempUpdatedJson.getLong("Id"));
accountItem.setId(tempUpdatedJson.getLong("Id"));
accountItem.setHeaderid(headerId);
accountItem.setHeaderId(headerId);
if (tempUpdatedJson.get("AccountId") != null && !tempUpdatedJson.get("AccountId").equals("")) {
accountItem.setAccountid(tempUpdatedJson.getLong("AccountId"));
accountItem.setAccountId(tempUpdatedJson.getLong("AccountId"));
}
if (tempUpdatedJson.get("InOutItemId") != null && !tempUpdatedJson.get("InOutItemId").equals("")) {
accountItem.setInoutitemid(tempUpdatedJson.getLong("InOutItemId"));
accountItem.setInOutItemId(tempUpdatedJson.getLong("InOutItemId"));
}
if (tempUpdatedJson.get("EachAmount") != null && !tempUpdatedJson.get("EachAmount").equals("")) {
BigDecimal eachAmount = tempUpdatedJson.getBigDecimal("EachAmount");
if (listType.equals("付款")) {
eachAmount = BigDecimal.ZERO.subtract(eachAmount);
}
accountItem.setEachamount(eachAmount);
accountItem.setEachAmount(eachAmount);
} else {
accountItem.setEachamount(BigDecimal.ZERO);
accountItem.setEachAmount(BigDecimal.ZERO);
}
accountItem.setRemark(tempUpdatedJson.getString("Remark"));
this.updateAccountItemWithObj(accountItem);

6
src/main/java/com/jsh/erp/service/depot/DepotService.java
View File

@@ -240,8 +240,8 @@ public class DepotService {
public int batchDeleteDepotByIdsNormal(String ids) throws Exception {
/**
* 校验
* 1、单据主表 jsh_depothead
* 2、单据子表 jsh_depotitem
* 1、单据主表 jsh_depot_head
* 2、单据子表 jsh_depot_item
* 是否有相关数据
* */
int deleteTotal=0;
@@ -251,7 +251,7 @@ public class DepotService {
String [] idArray=ids.split(",");
/**
* 校验单据子表 jsh_depotitem
* 校验单据子表 jsh_depot_item
* */
List<DepotItem> depotItemList=null;
try{

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

@@ -90,26 +90,26 @@ public class DepotHeadService {
}
if (null != list) {
for (DepotHeadVo4List dh : list) {
if(dh.getAccountidlist() != null) {
String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountidlist(accountidlistStr);
if(dh.getAccountIdList() != null) {
String accountidlistStr = dh.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountIdList(accountidlistStr);
}
if(dh.getAccountmoneylist() != null) {
String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountmoneylist(accountmoneylistStr);
if(dh.getAccountMoneyList() != null) {
String accountmoneylistStr = dh.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountMoneyList(accountmoneylistStr);
}
if(dh.getOthermoneylist() != null) {
String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOthermoneylist(otherMoneyListStr);
if(dh.getOtherMoneyList() != null) {
String otherMoneyListStr = dh.getOtherMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOtherMoneyList(otherMoneyListStr);
}
if(dh.getChangeamount() != null) {
dh.setChangeamount(dh.getChangeamount().abs());
if(dh.getChangeAmount() != null) {
dh.setChangeAmount(dh.getChangeAmount().abs());
}
if(dh.getTotalprice() != null) {
dh.setTotalprice(dh.getTotalprice().abs());
if(dh.getTotalPrice() != null) {
dh.setTotalPrice(dh.getTotalPrice().abs());
}
if(dh.getOpertime() != null) {
dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
if(dh.getOperTime() != null) {
dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
}
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh);
@@ -139,9 +139,9 @@ public class DepotHeadService {
if (userInfo != null) {
User sessionUser = (User) userInfo;
String uName = sessionUser.getUsername();
depotHead.setOperpersonname(uName);
depotHead.setOperPersonName(uName);
}
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setCreateTime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
int result=0;
try{
@@ -164,8 +164,8 @@ public class DepotHeadService {
DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
depotHead.setId(id);
depotHead.setStatus(dh.getStatus());
depotHead.setCreatetime(dh.getCreatetime());
depotHead.setOperpersonname(dh.getOperpersonname());
depotHead.setCreateTime(dh.getCreateTime());
depotHead.setOperPersonName(dh.getOperPersonName());
int result=0;
try{
result = depotHeadMapper.updateByPrimaryKey(depotHead);
@@ -342,9 +342,9 @@ public class DepotHeadService {
String modeName = "";
BigDecimal allOtherMoney = BigDecimal.ZERO;
if (mode.equals("实际")) {
modeName = "ChangeAmount";
modeName = "change_amount";
} else if (mode.equals("合计")) {
modeName = "DiscountLastMoney";
modeName = "discount_last_money";
allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime);
}
BigDecimal result = BigDecimal.ZERO;
@@ -419,29 +419,29 @@ public class DepotHeadService {
}
if (null != list) {
for (DepotHeadVo4List dh : list) {
if(dh.getAccountidlist() != null) {
String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountidlist(accountidlistStr);
if(dh.getAccountIdList() != null) {
String accountidlistStr = dh.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountIdList(accountidlistStr);
}
if(dh.getAccountmoneylist() != null) {
String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountmoneylist(accountmoneylistStr);
if(dh.getAccountMoneyList() != null) {
String accountmoneylistStr = dh.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountMoneyList(accountmoneylistStr);
}
if(dh.getOthermoneylist() != null) {
String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOthermoneylist(otherMoneyListStr);
if(dh.getOtherMoneyList() != null) {
String otherMoneyListStr = dh.getOtherMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOtherMoneyList(otherMoneyListStr);
}
if(dh.getOthermoneyitem() != null) {
String otherMoneyItemStr = dh.getOthermoneyitem().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOthermoneyitem(otherMoneyItemStr);
if(dh.getOtherMoneyItem() != null) {
String otherMoneyItemStr = dh.getOtherMoneyItem().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setOtherMoneyItem(otherMoneyItemStr);
}
if(dh.getChangeamount() != null) {
dh.setChangeamount(dh.getChangeamount().abs());
if(dh.getChangeAmount() != null) {
dh.setChangeAmount(dh.getChangeAmount().abs());
}
if(dh.getTotalprice() != null) {
dh.setTotalprice(dh.getTotalprice().abs());
if(dh.getTotalPrice() != null) {
dh.setTotalPrice(dh.getTotalPrice().abs());
}
dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh);
}
@@ -466,9 +466,9 @@ public class DepotHeadService {
DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
//判断用户是否已经登录过，登录过不再处理
User userInfo=userService.getCurrentUser();
depotHead.setHandspersonid(userInfo==null?null:userInfo.getId());
depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setHandsPersonId(userInfo==null?null:userInfo.getId());
depotHead.setOperPersonName(userInfo==null?null:userInfo.getUsername());
depotHead.setCreateTime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
try{
depotHeadMapper.insertSelective(depotHead);
@@ -476,14 +476,14 @@ public class DepotHeadService {
JshException.writeFail(logger, e);
}
/**入库和出库处理预付款信息*/
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
if(depotHead.getOrganid()!=null) {
supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice()));
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPayType())){
if(depotHead.getOrganId()!=null) {
supplierService.updateAdvanceIn(depotHead.getOrganId(), BigDecimal.ZERO.subtract(depotHead.getTotalPrice()));
}
}
//根据单据编号查询单据id
DepotHeadExample dhExample = new DepotHeadExample();
dhExample.createCriteria().andDefaultnumberEqualTo(depotHead.getDefaultnumber()).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
dhExample.createCriteria().andDefaultNumberEqualTo(depotHead.getDefaultNumber()).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<DepotHead> list = depotHeadMapper.selectByExample(dhExample);
if(list!=null) {
Long headId = list.get(0).getId();
@@ -491,11 +491,11 @@ public class DepotHeadService {
depotItemService.saveDetials(inserted,deleted,updated,headId,tenantId, request);
}
/**如果关联单据号非空则更新订单的状态为2 */
if(depotHead.getLinknumber()!=null) {
if(depotHead.getLinkNumber()!=null) {
DepotHead depotHeadOrders = new DepotHead();
depotHeadOrders.setStatus(BusinessConstants.BILLS_STATUS_SKIP);
DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andNumberEqualTo(depotHead.getLinknumber());
example.createCriteria().andNumberEqualTo(depotHead.getLinkNumber());
try{
depotHeadMapper.updateByExampleSelective(depotHeadOrders, example);
}catch(Exception e){
@@ -527,16 +527,16 @@ public class DepotHeadService {
//判断用户是否已经登录过，登录过不再处理
depotHead.setId(id);
User userInfo=userService.getCurrentUser();
depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
depotHead.setOperPersonName(userInfo==null?null:userInfo.getUsername());
try{
depotHeadMapper.updateByPrimaryKeySelective(depotHead);
}catch(Exception e){
JshException.writeFail(logger, e);
}
/**入库和出库处理预付款信息*/
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
if(depotHead.getOrganid()!=null){
supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice().subtract(preTotalPrice)));
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPayType())){
if(depotHead.getOrganId()!=null){
supplierService.updateAdvanceIn(depotHead.getOrganId(), BigDecimal.ZERO.subtract(depotHead.getTotalPrice().subtract(preTotalPrice)));
}
}
/**入库和出库处理单据子表信息*/
@@ -558,7 +558,7 @@ public class DepotHeadService {
User userInfo=userService.getCurrentUser();
//删除出库数据回收序列号
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())){
//查询单据子表列表
List<DepotItem> depotItemList=null;
try{
@@ -571,7 +571,7 @@ public class DepotHeadService {
if(depotItemList!=null&&depotItemList.size()>0){
for(DepotItem depotItem:depotItemList){
//BasicNumber=OperNumber*ratio
serialNumberService.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),userInfo);
serialNumberService.cancelSerialNumber(depotItem.getMaterialId(), depotItem.getHeaderId(),(depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),userInfo);
}
}
}

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

@@ -224,7 +224,7 @@ public class DepotItemService {
List<DepotItem> list =null;
try{
DepotItemExample example = new DepotItemExample();
example.createCriteria().andHeaderidEqualTo(headerId);
example.createCriteria().andHeaderIdEqualTo(headerId);
list = depotItemMapper.selectByExample(example);
}catch(Exception e){
JshException.readFail(logger, e);
@@ -327,7 +327,7 @@ public class DepotItemService {
//首先回收序列号，如果是调拨，不用处理序列号
JSONObject tempDeletedJson = JSONObject.parseObject(deletedJson.getString(i));
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())){
DepotItem depotItem = getDepotItem(tempDeletedJson.getLong("Id"));
if(depotItem==null){
continue;
@@ -335,12 +335,12 @@ public class DepotItemService {
/**
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
* */
Material material= materialService.getMaterial(depotItem.getMaterialid());
Material material= materialService.getMaterial(depotItem.getMaterialId());
if(material==null){
continue;
}
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())){
serialNumberService.cancelSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())){
serialNumberService.cancelSerialNumber(depotItem.getMaterialId(),depotItem.getHeaderId(),(depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),
userInfo);
}
}
@@ -361,14 +361,14 @@ public class DepotItemService {
for (int i = 0; i < insertedJson.size(); i++) {
DepotItem depotItem = new DepotItem();
JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
depotItem.setHeaderid(headerId);
depotItem.setHeaderId(headerId);
Long materialExtendId = tempInsertedJson.getLong("MaterialExtendId");
Long materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId();
depotItem.setMaterialid(materialId);
depotItem.setMaterialId(materialId);
depotItem.setMaterialExtendId(tempInsertedJson.getLong("MaterialExtendId"));
depotItem.setMunit(tempInsertedJson.getString("Unit"));
depotItem.setMaterialUnit(tempInsertedJson.getString("Unit"));
if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) {
depotItem.setOpernumber(tempInsertedJson.getBigDecimal("OperNumber"));
depotItem.setOperNumber(tempInsertedJson.getBigDecimal("OperNumber"));
try {
String Unit = tempInsertedJson.get("Unit").toString();
BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber");
@@ -381,59 +381,59 @@ public class DepotItemService {
String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位
Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例
if (Unit.equals(basicUnit)) { //如果等于基础单位
depotItem.setBasicnumber(oNumber); //数量一致
depotItem.setBasicNumber(oNumber); //数量一致
} else if (Unit.equals(otherUnit)) { //如果等于副单位
depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例
depotItem.setBasicNumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例
}
} else {
depotItem.setBasicnumber(oNumber); //其他情况
depotItem.setBasicNumber(oNumber); //其他情况
}
} catch (Exception e) {
logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
}
}
if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) {
depotItem.setUnitprice(tempInsertedJson.getBigDecimal("UnitPrice"));
depotItem.setUnitPrice(tempInsertedJson.getBigDecimal("UnitPrice"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())) {
depotItem.setTaxunitprice(tempInsertedJson.getBigDecimal("TaxUnitPrice"));
depotItem.setTaxUnitPrice(tempInsertedJson.getBigDecimal("TaxUnitPrice"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("AllPrice").toString())) {
depotItem.setAllprice(tempInsertedJson.getBigDecimal("AllPrice"));
depotItem.setAllPrice(tempInsertedJson.getBigDecimal("AllPrice"));
}
depotItem.setRemark(tempInsertedJson.getString("Remark"));
if (tempInsertedJson.get("DepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("DepotId").toString())) {
depotItem.setDepotid(tempInsertedJson.getLong("DepotId"));
depotItem.setDepotId(tempInsertedJson.getLong("DepotId"));
}
if (tempInsertedJson.get("AnotherDepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("AnotherDepotId").toString())) {
depotItem.setAnotherdepotid(tempInsertedJson.getLong("AnotherDepotId"));
depotItem.setAnotherDepotId(tempInsertedJson.getLong("AnotherDepotId"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxRate").toString())) {
depotItem.setTaxrate(tempInsertedJson.getBigDecimal("TaxRate"));
depotItem.setTaxRate(tempInsertedJson.getBigDecimal("TaxRate"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxMoney").toString())) {
depotItem.setTaxmoney(tempInsertedJson.getBigDecimal("TaxMoney"));
depotItem.setTaxMoney(tempInsertedJson.getBigDecimal("TaxMoney"));
}
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) {
depotItem.setTaxlastmoney(tempInsertedJson.getBigDecimal("TaxLastMoney"));
depotItem.setTaxLastMoney(tempInsertedJson.getBigDecimal("TaxLastMoney"));
}
if (tempInsertedJson.get("OtherField1") != null) {
depotItem.setOtherfield1(tempInsertedJson.getString("OtherField1"));
depotItem.setOtherField1(tempInsertedJson.getString("OtherField1"));
}
if (tempInsertedJson.get("OtherField2") != null) {
depotItem.setOtherfield2(tempInsertedJson.getString("OtherField2"));
depotItem.setOtherField2(tempInsertedJson.getString("OtherField2"));
}
if (tempInsertedJson.get("OtherField3") != null) {
depotItem.setOtherfield3(tempInsertedJson.getString("OtherField3"));
depotItem.setOtherField3(tempInsertedJson.getString("OtherField3"));
}
if (tempInsertedJson.get("OtherField4") != null) {
depotItem.setOtherfield4(tempInsertedJson.getString("OtherField4"));
depotItem.setOtherField4(tempInsertedJson.getString("OtherField4"));
}
if (tempInsertedJson.get("OtherField5") != null) {
depotItem.setOtherfield5(tempInsertedJson.getString("OtherField5"));
depotItem.setOtherField5(tempInsertedJson.getString("OtherField5"));
}
if (tempInsertedJson.get("MType") != null) {
depotItem.setMtype(tempInsertedJson.getString("MType"));
depotItem.setMaterialType(tempInsertedJson.getString("MType"));
}
/**
* 出库时判断库存是否充足
@@ -442,23 +442,23 @@ public class DepotItemService {
if(depotItem==null){
continue;
}
Material material= materialService.getMaterial(depotItem.getMaterialid());
Material material= materialService.getMaterial(depotItem.getMaterialId());
if(material==null){
continue;
}
BigDecimal stock = getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId);
BigDecimal thisBasicNumber = depotItem.getBasicnumber()==null?BigDecimal.ZERO:depotItem.getBasicnumber();
BigDecimal stock = getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId);
BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber();
if(systemConfigService.getMinusStockFlag() == false && stock.compareTo(thisBasicNumber)<0){
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName()));
}
/**出库时处理序列号*/
if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())) {
if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) {
/**
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
* */
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
//查询单据子表中开启序列号的数据列表
serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo);
}
@@ -477,23 +477,23 @@ public class DepotItemService {
if(depotItem==null){
continue;
}
Material material= materialService.getMaterial(depotItem.getMaterialid());
Material material= materialService.getMaterial(depotItem.getMaterialId());
if(material==null){
continue;
}
//首先回收序列号
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())) {
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) {
/**
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
* */
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
serialNumberService.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(), (depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
serialNumberService.cancelSerialNumber(depotItem.getMaterialId(), depotItem.getHeaderId(), (depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),
userInfo);
}
/**收回序列号的时候释放库存*/
depotItem.setOpernumber(BigDecimal.ZERO);
depotItem.setBasicnumber(BigDecimal.ZERO);
depotItem.setOperNumber(BigDecimal.ZERO);
depotItem.setBasicNumber(BigDecimal.ZERO);
this.updateDepotItemWithObj(depotItem);
}
depotItem.setId(tempUpdatedJson.getLong("Id"));
@@ -501,12 +501,12 @@ public class DepotItemService {
if (StringUtil.isExist(tempUpdatedJson.get("MaterialExtendId"))) {
Long materialExtendId = tempUpdatedJson.getLong("MaterialExtendId");
materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId();
depotItem.setMaterialid(materialId);
depotItem.setMaterialId(materialId);
depotItem.setMaterialExtendId(tempUpdatedJson.getLong("MaterialExtendId"));
}
depotItem.setMunit(tempUpdatedJson.getString("Unit"));
depotItem.setMaterialUnit(tempUpdatedJson.getString("Unit"));
if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) {
depotItem.setOpernumber(tempUpdatedJson.getBigDecimal("OperNumber"));
depotItem.setOperNumber(tempUpdatedJson.getBigDecimal("OperNumber"));
try {
String Unit = tempUpdatedJson.get("Unit").toString();
BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber");
@@ -519,48 +519,48 @@ public class DepotItemService {
String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位
Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例
if (Unit.equals(basicUnit)) { //如果等于基础单位
depotItem.setBasicnumber(oNumber); //数量一致
depotItem.setBasicNumber(oNumber); //数量一致
} else if (Unit.equals(otherUnit)) { //如果等于副单位
depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例
depotItem.setBasicNumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例
}
} else {
depotItem.setBasicnumber(oNumber); //其他情况
depotItem.setBasicNumber(oNumber); //其他情况
}
} catch (Exception e) {
logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
}
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("UnitPrice").toString())) {
depotItem.setUnitprice(tempUpdatedJson.getBigDecimal("UnitPrice"));
depotItem.setUnitPrice(tempUpdatedJson.getBigDecimal("UnitPrice"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxUnitPrice").toString())) {
depotItem.setTaxunitprice(tempUpdatedJson.getBigDecimal("TaxUnitPrice"));
depotItem.setTaxUnitPrice(tempUpdatedJson.getBigDecimal("TaxUnitPrice"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("AllPrice").toString())) {
depotItem.setAllprice(tempUpdatedJson.getBigDecimal("AllPrice"));
depotItem.setAllPrice(tempUpdatedJson.getBigDecimal("AllPrice"));
}
depotItem.setRemark(tempUpdatedJson.getString("Remark"));
if (tempUpdatedJson.get("DepotId") != null && !StringUtil.isEmpty(tempUpdatedJson.get("DepotId").toString())) {
depotItem.setDepotid(tempUpdatedJson.getLong("DepotId"));
depotItem.setDepotId(tempUpdatedJson.getLong("DepotId"));
}
if (tempUpdatedJson.get("AnotherDepotId") != null && !StringUtil.isEmpty(tempUpdatedJson.get("AnotherDepotId").toString())) {
depotItem.setAnotherdepotid(tempUpdatedJson.getLong("AnotherDepotId"));
depotItem.setAnotherDepotId(tempUpdatedJson.getLong("AnotherDepotId"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxRate").toString())) {
depotItem.setTaxrate(tempUpdatedJson.getBigDecimal("TaxRate"));
depotItem.setTaxRate(tempUpdatedJson.getBigDecimal("TaxRate"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxMoney").toString())) {
depotItem.setTaxmoney(tempUpdatedJson.getBigDecimal("TaxMoney"));
depotItem.setTaxMoney(tempUpdatedJson.getBigDecimal("TaxMoney"));
}
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxLastMoney").toString())) {
depotItem.setTaxlastmoney(tempUpdatedJson.getBigDecimal("TaxLastMoney"));
depotItem.setTaxLastMoney(tempUpdatedJson.getBigDecimal("TaxLastMoney"));
}
depotItem.setOtherfield1(tempUpdatedJson.getString("OtherField1"));
depotItem.setOtherfield2(tempUpdatedJson.getString("OtherField2"));
depotItem.setOtherfield3(tempUpdatedJson.getString("OtherField3"));
depotItem.setOtherfield4(tempUpdatedJson.getString("OtherField4"));
depotItem.setOtherfield5(tempUpdatedJson.getString("OtherField5"));
depotItem.setMtype(tempUpdatedJson.getString("MType"));
depotItem.setOtherField1(tempUpdatedJson.getString("OtherField1"));
depotItem.setOtherField2(tempUpdatedJson.getString("OtherField2"));
depotItem.setOtherField3(tempUpdatedJson.getString("OtherField3"));
depotItem.setOtherField4(tempUpdatedJson.getString("OtherField4"));
depotItem.setOtherField5(tempUpdatedJson.getString("OtherField5"));
depotItem.setMaterialType(tempUpdatedJson.getString("MType"));
/**
* create by: qiankunpingtai
* create time: 2019/3/25 15:18
@@ -569,25 +569,25 @@ public class DepotItemService {
* 修改了商品类型时，库中的商品和页面传递的不同
* 这里需要重新获取页面传递的商品信息
*/
if(!material.getId().equals(depotItem.getMaterialid())){
material= materialService.getMaterial(depotItem.getMaterialid());
if(!material.getId().equals(depotItem.getMaterialId())){
material= materialService.getMaterial(depotItem.getMaterialId());
if(material==null){
continue;
}
}
/**出库时处理序列号*/
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){
BigDecimal stock = getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId);
BigDecimal thisBasicNumber = depotItem.getBasicnumber()==null?BigDecimal.ZERO:depotItem.getBasicnumber();
BigDecimal stock = getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId);
BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber();
if(systemConfigService.getMinusStockFlag() == false && stock.compareTo(thisBasicNumber)<0){
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName()));
}
if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())) {
if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) {
/**
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
* */
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
//查询单据子表中开启序列号的数据列表
serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo);
}
@@ -709,13 +709,13 @@ public class DepotItemService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public void updateCurrentStock(DepotItem depotItem, Long tenantId){
MaterialCurrentStockExample example = new MaterialCurrentStockExample();
example.createCriteria().andMaterialIdEqualTo(depotItem.getMaterialid()).andDepotIdEqualTo(depotItem.getDepotid())
example.createCriteria().andMaterialIdEqualTo(depotItem.getMaterialId()).andDepotIdEqualTo(depotItem.getDepotId())
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<MaterialCurrentStock> list = materialCurrentStockMapper.selectByExample(example);
MaterialCurrentStock materialCurrentStock = new MaterialCurrentStock();
materialCurrentStock.setMaterialId(depotItem.getMaterialid());
materialCurrentStock.setDepotId(depotItem.getDepotid());
materialCurrentStock.setCurrentNumber(getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId));
materialCurrentStock.setMaterialId(depotItem.getMaterialId());
materialCurrentStock.setDepotId(depotItem.getDepotId());
materialCurrentStock.setCurrentNumber(getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId));
if(list!=null && list.size()>0) {
Long mcsId = list.get(0).getId();
materialCurrentStock.setId(mcsId);

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

@@ -119,13 +119,13 @@ public class MaterialService {
materialOther = materialOther + ((m.getMfrs() == null || m.getMfrs().equals("")) ? "" : "(" + m.getMfrs() + ")");
}
if (mpArr[i].equals("自定义1")) {
materialOther = materialOther + ((m.getOtherfield1() == null || m.getOtherfield1().equals("")) ? "" : "(" + m.getOtherfield1() + ")");
materialOther = materialOther + ((m.getOtherField1() == null || m.getOtherField1().equals("")) ? "" : "(" + m.getOtherField1() + ")");
}
if (mpArr[i].equals("自定义2")) {
materialOther = materialOther + ((m.getOtherfield2() == null || m.getOtherfield2().equals("")) ? "" : "(" + m.getOtherfield2() + ")");
materialOther = materialOther + ((m.getOtherField2() == null || m.getOtherField2().equals("")) ? "" : "(" + m.getOtherField2() + ")");
}
if (mpArr[i].equals("自定义3")) {
materialOther = materialOther + ((m.getOtherfield3() == null || m.getOtherfield3().equals("")) ? "" : "(" + m.getOtherfield3() + ")");
materialOther = materialOther + ((m.getOtherField3() == null || m.getOtherField3().equals("")) ? "" : "(" + m.getOtherField3() + ")");
}
}
m.setMaterialOther(materialOther);
@@ -155,7 +155,7 @@ public class MaterialService {
Long mId = null;
materialMapper.insertSelective(m);
List<Material> materials = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),
m.getStandard(), m.getMfrs(),m.getUnit(),m.getUnitid());
m.getStandard(), m.getMfrs(),m.getUnit(),m.getUnitId());
if(materials!=null && materials.size()>0) {
mId = materials.get(0).getId();
}
@@ -265,7 +265,7 @@ public class MaterialService {
MaterialExample.Criteria criteria = example.createCriteria();
criteria.andNameEqualTo(name).andModelEqualTo(model).andColorEqualTo(color)
.andStandardEqualTo(standard).andMfrsEqualTo(mfrs)
.andOtherfield1EqualTo(otherField1).andOtherfield2EqualTo(otherField2).andOtherfield2EqualTo(otherField3)
.andOtherField1EqualTo(otherField1).andOtherField2EqualTo(otherField2).andOtherField2EqualTo(otherField3)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
if (id > 0) {
criteria.andIdNotEqualTo(id);
@@ -274,7 +274,7 @@ public class MaterialService {
criteria.andUnitEqualTo(unit);
}
if (unitId !=null) {
criteria.andUnitidEqualTo(unitId);
criteria.andUnitIdEqualTo(unitId);
}
List<Material> list =null;
try{
@@ -400,8 +400,8 @@ public class MaterialService {
m.setModel(model);
m.setColor(color);
Long categoryId = materialCategoryService.getCategoryIdByName(categoryName);
m.setCategoryid(categoryId);
m.setSafetystock(parseBigDecimalEx(safetyStock));
m.setCategoryId(categoryId);
m.setSafetyStock(parseBigDecimalEx(safetyStock));
String manyUnit = ExcelUtils.getContent(src, i, 7); //副单位
String barCode = ExcelUtils.getContent(src, i, 8); //基础条码
String manyBarCode = ExcelUtils.getContent(src, i, 9); //副条码
@@ -422,7 +422,7 @@ public class MaterialService {
if(StringUtil.isNotEmpty(manyUnit.trim())){ //多单位
String manyUnitAll = unit + "," + manyUnit + "(1:" + ratio + ")";
Long unitId = unitService.getUnitIdByName(manyUnitAll);
m.setUnitid(unitId);
m.setUnitId(unitId);
JSONObject otherObj = new JSONObject();
otherObj.put("barCode", manyBarCode);
otherObj.put("commodityUnit", manyUnit);
@@ -466,11 +466,11 @@ public class MaterialService {
for(MaterialWithInitStock m: mList) {
//判断该商品是否存在，如果不存在就新增，如果存在就更新
List<Material> materials = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),m.getStandard(),
m.getMfrs(),m.getUnit(),m.getUnitid());
m.getMfrs(),m.getUnit(),m.getUnitId());
if(materials.size()<=0) {
materialMapper.insertSelective(m);
List<Material> newList = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),m.getStandard(),
m.getMfrs(),m.getUnit(),m.getUnitid());
m.getMfrs(),m.getUnit(),m.getUnitId());
if(newList!=null && newList.size()>0) {
mId = newList.get(0).getId();
}
@@ -561,7 +561,7 @@ public class MaterialService {
criteria.andUnitEqualTo(unit);
}
if (unitId !=null) {
criteria.andUnitidEqualTo(unitId);
criteria.andUnitIdEqualTo(unitId);
}
criteria.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Material> list = materialMapper.selectByExample(example);
@@ -639,7 +639,7 @@ public class MaterialService {
public int batchDeleteMaterialByIdsNormal(String ids) throws Exception{
/**
* 校验
* 1、单据子表 jsh_depotitem
* 1、单据子表 jsh_depot_item
* 是否有相关数据
* */
int deleteTotal=0;
@@ -649,7 +649,7 @@ public class MaterialService {
String [] idArray=ids.split(",");
/**
* 校验单据子表 jsh_depotitem
* 校验单据子表 jsh_depot_item
* */
List<DepotItem> depotItemList =null;
try{

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

@@ -236,7 +236,7 @@ public class PersonService {
/**
* 校验
* 1、财务主表 jsh_accounthead
* 2、单据主表 jsh_depothead
* 2、单据主表 jsh_depot_head
* 是否有相关数据
* */
int deleteTotal=0;
@@ -260,7 +260,7 @@ public class PersonService {
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
}
/**
* 校验单据主表 jsh_depothead
* 校验单据主表 jsh_depot_head
* */
List<DepotHead> depotHeadList =null;
try{

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

@@ -346,7 +346,7 @@ public class SerialNumberService {
}
//获得唯一商品
if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableserialnumber())) {
if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableSerialNumber())) {
//商品未开启序列号
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_CODE,
ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_MSG);
@@ -400,16 +400,16 @@ public class SerialNumberService {
public void checkAndUpdateSerialNumber(DepotItem depotItem,User userInfo) throws Exception{
if(depotItem!=null){
//查询商品下已分配的可用序列号数量
int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD);
int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialId(),null,BusinessConstants.IS_SELL_HOLD);
//BasicNumber=OperNumber*ratio
if((depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue()>SerialNumberSum){
if((depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue()>SerialNumberSum){
//获取商品名称
Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid());
Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialId());
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE,
String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName()));
}
//商品下序列号充足，分配序列号
sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),userInfo);
sellSerialNumber(depotItem.getMaterialId(),depotItem.getHeaderId(),(depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),userInfo);
}
}
/**

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

@@ -103,11 +103,11 @@ public class SupplierService {
supType = "vendor";
}
BigDecimal sum = BigDecimal.ZERO;
BigDecimal beginNeedGet = s.getBeginneedget();
BigDecimal beginNeedGet = s.getBeginNeedGet();
if(beginNeedGet==null) {
beginNeedGet = BigDecimal.ZERO;
}
BigDecimal beginNeedPay = s.getBeginneedpay();
BigDecimal beginNeedPay = s.getBeginNeedPay();
if(beginNeedPay==null) {
beginNeedPay = BigDecimal.ZERO;
}
@@ -115,12 +115,12 @@ public class SupplierService {
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);
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);
s.setAllNeedGet(BigDecimal.ZERO);
s.setAllNeedPay(sum);
}
resList.add(s);
}
@@ -157,11 +157,11 @@ public class SupplierService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateSupplier(String beanJson, Long id, HttpServletRequest request)throws Exception {
Supplier supplier = JSONObject.parseObject(beanJson, Supplier.class);
if(supplier.getBeginneedpay() == null) {
supplier.setBeginneedpay(BigDecimal.ZERO);
if(supplier.getBeginNeedPay() == null) {
supplier.setBeginNeedPay(BigDecimal.ZERO);
}
if(supplier.getBeginneedget() == null) {
supplier.setBeginneedget(BigDecimal.ZERO);
if(supplier.getBeginNeedGet() == null) {
supplier.setBeginNeedGet(BigDecimal.ZERO);
}
supplier.setId(id);
int result=0;
@@ -229,7 +229,7 @@ public class SupplierService {
int result=0;
try{
if(supplier!=null){
supplier.setAdvancein(supplier.getAdvancein().add(advanceIn)); //增加预收款的金额，可能增加的是负值
supplier.setAdvanceIn(supplier.getAdvanceIn().add(advanceIn)); //增加预收款的金额，可能增加的是负值
result=supplierMapper.updateByPrimaryKeySelective(supplier);
}
}catch(Exception e){
@@ -391,7 +391,7 @@ public class SupplierService {
/**
* 校验
* 1、财务主表 jsh_accounthead
* 2、单据主表 jsh_depothead
* 2、单据主表 jsh_depot_head
* 是否有相关数据
* */
int deleteTotal=0;
@@ -415,7 +415,7 @@ public class SupplierService {
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
}
/**
* 校验单据主表 jsh_depothead
* 校验单据主表 jsh_depot_head
* */
List<DepotHead> depotHeadList=null;
try{