diff --git a/README.md b/README.md index 15c891e6ff..0f8c7dc716 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,12 @@ # 项目总述 * 很多人说华夏ERP（英文名：jshERP）是目前唯一完整开源的进销存系统 * 虽然目前只有进销存+财务的功能，但后面将会推出ERP的全部功能，大家一起努力吧 -* 官网地址：[https://www.huaxiaerp.com](https://www.huaxiaerp.com)，演示账号：jsh，密码：123456 -* **商家入驻通道：[https://www.huaxiaerp.com/register.html](https://www.huaxiaerp.com/register.html) 欢迎注册使用** +* **官网地址：[https://www.huaxiaerp.com](https://www.huaxiaerp.com)，演示账号：jsh，密码：123456 (欢迎商家入驻)** * 商务合作-请联系QQ：514869858，技术交流-请联系QQ：752718920 * 欢迎加入华夏ERP交流QQ群，群1：120725710(满)、群2：732152262 * 系统默认租户账号：jsh，默认超管账户：admin，默认密码均为：123456 * 部署如遇到困难请参考Wiki文档 https://gitee.com/jishenghua/JSH_ERP/wikis/pages -* 华夏ERP参加了(2019年度最受欢迎开源中国软件评选)，欢迎小伙伴们投票 https://www.oschina.net/p/jsherp - # 定制服务 * 如有ERP **私人定制** 需求，请将需求整理成文档，发给邮箱： **514869858@qq.com** ，我会及时回复哒 @@ -17,6 +14,7 @@ * 华夏ERP立志为中小企业提供开源好用的ERP软件，降低企业的信息化成本 * 个人开发者也可以使用华夏ERP进行二次开发，加快完成开发任务 * 初学JAVA的小伙伴可以下载源代码来进行学习交流 +* 感谢热心的小伙伴整理的用户手册 https://www.kdocs.cn/l/sfCyirZyr?f=501 # 技术框架 * 核心框架：SpringBoot 2.0.0 @@ -30,13 +28,13 @@ # 开发环境 建议开发者使用以下环境，可以避免版本带来的问题 * IDE: IntelliJ IDEA 2017+ -* DB: Mysql5.7.4 +* DB: Mysql5.7+ * JDK: JDK1.8 * Maven: Maven3.2.3+ -* 为方便大家搭建开发环境，分享了下载地址 **https://pan.baidu.com/s/1iuNOSuijcU9vrVT4PCl0hQ** 提取码：bik7 +* 为方便大家搭建开发环境，分享了下载地址 https://pan.baidu.com/s/1jlild9uyGdQ7H2yaMx76zw 提取码:814g # 运行环境 -* 数据库服务器：Mysql5.7.4 +* 数据库服务器：Mysql5.7+ * JAVA平台: JRE1.8 * 操作系统：Windows、Linux等 diff --git a/erp_web/css/jsherp.css b/erp_web/css/jsherp.css index e5c335eb11..0a2a0dd1e6 100644 --- a/erp_web/css/jsherp.css +++ b/erp_web/css/jsherp.css @@ -1,6 +1,6 @@ /*! - * Copyright (c) 2013-Now 华夏erp All rights reserved. - * @author jishenghua + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + * @author ThinkGem * @version 2019-09-14 */ .nobg { diff --git a/erp_web/js/common/jsherp.js b/erp_web/js/common/jsherp.js index 5a23be2059..2e73b1d915 100644 --- a/erp_web/js/common/jsherp.js +++ b/erp_web/js/common/jsherp.js @@ -1,9 +1,9 @@ /*! - * Copyright (c) 2013-Now 华夏ERP All rights reserved. - * + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + * * 通用公共JavaScript，注意：项目请不要修改公共CSS样式，若需要新增或调整，请在common.js中覆盖 - * @author jishenghua - * @version 2019-9-14 + * @author ThinkGem + * @version 2019-7-10 */ if (typeof jQuery === "undefined") { throw new Error("JSHERP's JavaScript requires jQuery") diff --git a/erp_web/js/pages/materials/bill_detail.js b/erp_web/js/pages/materials/bill_detail.js index e57ea1a037..787c04040b 100644 --- a/erp_web/js/pages/materials/bill_detail.js +++ b/erp_web/js/pages/materials/bill_detail.js @@ -16,8 +16,6 @@ }); - - //获取账户信息 function initSystemData_account(){ $.ajax({ @@ -191,9 +189,6 @@ tableString = $(".advance_in").html(); } - - - //如果是进货、销售 if(billType == "material"){ $.ajax({ diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js index 29f896318c..613590fa63 100644 --- a/erp_web/js/pages/materials/in_out.js +++ b/erp_web/js/pages/materials/in_out.js @@ -3,15 +3,8 @@ var kid = sessionStorage.getItem("userId"); var pageType = getUrlParam('t'); //获取页面类型传值 var depotList = null; - var depotID = null; - var supplierList = null; - var supplierID = null; - var personList = null; - var ProjectSearch=null; var userBusinessList=null; var userdepot=null; - var depotHeadMaxId=null; //获取最大的Id - var accepId=null; //保存的主表id var url; var depotHeadID = 0; var preTotalPrice = 0; //前一次加载的金额 @@ -2598,8 +2591,11 @@ if (row.length > 0) { $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条单据信息吗？', function (r) { if (r) { + var body =$("#depotHeadFM .datagrid-body"); + var footer =$("#depotHeadFM .datagrid-footer"); for (var i = 0; i < row.length; i++) { $('#materialData').datagrid('deleteRow', $('#materialData').datagrid("getRowIndex", row[i])); + statisticsFun(body,0,0,footer,0); } } }); diff --git a/pom.xml b/pom.xml index 18f4e423a1..3867dc3215 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ org.mybatis.generator mybatis-generator-maven-plugin - 1.3.2 + 1.4.0 ${basedir}/src/test/resources/generatorConfig.xml true diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java index 0d8518c909..54783bd108 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java @@ -4,994 +4,312 @@ import java.util.Date; public class DepotHead { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Id - * - * @mbggenerated - */ private Long id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Type - * - * @mbggenerated - */ private String type; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.SubType - * - * @mbggenerated - */ private String subtype; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.ProjectId - * - * @mbggenerated - */ private Long projectid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.DefaultNumber - * - * @mbggenerated - */ private String defaultnumber; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Number - * - * @mbggenerated - */ private String number; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OperPersonName - * - * @mbggenerated - */ private String operpersonname; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.CreateTime - * - * @mbggenerated - */ private Date createtime; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OperTime - * - * @mbggenerated - */ private Date opertime; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OrganId - * - * @mbggenerated - */ private Long organid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.HandsPersonId - * - * @mbggenerated - */ private Long handspersonid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AccountId - * - * @mbggenerated - */ private Long accountid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.ChangeAmount - * - * @mbggenerated - */ private BigDecimal changeamount; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AllocationProjectId - * - * @mbggenerated - */ private Long allocationprojectid; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.TotalPrice - * - * @mbggenerated - */ private BigDecimal totalprice; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.PayType - * - * @mbggenerated - */ private String paytype; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Remark - * - * @mbggenerated - */ private String remark; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Salesman - * - * @mbggenerated - */ private String salesman; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AccountIdList - * - * @mbggenerated - */ private String accountidlist; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AccountMoneyList - * - * @mbggenerated - */ private String accountmoneylist; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Discount - * - * @mbggenerated - */ private BigDecimal discount; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.DiscountMoney - * - * @mbggenerated - */ private BigDecimal discountmoney; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.DiscountLastMoney - * - * @mbggenerated - */ private BigDecimal discountlastmoney; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OtherMoney - * - * @mbggenerated - */ private BigDecimal othermoney; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OtherMoneyList - * - * @mbggenerated - */ private String othermoneylist; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.OtherMoneyItem - * - * @mbggenerated - */ private String othermoneyitem; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.AccountDay - * - * @mbggenerated - */ private Integer accountday; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.Status - * - * @mbggenerated - */ private String status; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.LinkNumber - * - * @mbggenerated - */ private String linknumber; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.tenant_id - * - * @mbggenerated - */ private Long tenantId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_depothead.delete_Flag - * - * @mbggenerated - */ private String deleteFlag; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Id - * - * @return the value of jsh_depothead.Id - * - * @mbggenerated - */ public Long getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Id - * - * @param id the value for jsh_depothead.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_depothead.Type - * - * @return the value of jsh_depothead.Type - * - * @mbggenerated - */ public String getType() { return type; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Type - * - * @param type the value for jsh_depothead.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_depothead.SubType - * - * @return the value of jsh_depothead.SubType - * - * @mbggenerated - */ public String getSubtype() { return subtype; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.SubType - * - * @param subtype the value for jsh_depothead.SubType - * - * @mbggenerated - */ public void setSubtype(String subtype) { this.subtype = subtype == null ? null : subtype.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.ProjectId - * - * @return the value of jsh_depothead.ProjectId - * - * @mbggenerated - */ public Long getProjectid() { return projectid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.ProjectId - * - * @param projectid the value for jsh_depothead.ProjectId - * - * @mbggenerated - */ public void setProjectid(Long projectid) { this.projectid = projectid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.DefaultNumber - * - * @return the value of jsh_depothead.DefaultNumber - * - * @mbggenerated - */ public String getDefaultnumber() { return defaultnumber; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.DefaultNumber - * - * @param defaultnumber the value for jsh_depothead.DefaultNumber - * - * @mbggenerated - */ public void setDefaultnumber(String defaultnumber) { this.defaultnumber = defaultnumber == null ? null : defaultnumber.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Number - * - * @return the value of jsh_depothead.Number - * - * @mbggenerated - */ public String getNumber() { return number; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Number - * - * @param number the value for jsh_depothead.Number - * - * @mbggenerated - */ public void setNumber(String number) { this.number = number == null ? null : number.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OperPersonName - * - * @return the value of jsh_depothead.OperPersonName - * - * @mbggenerated - */ public String getOperpersonname() { return operpersonname; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OperPersonName - * - * @param operpersonname the value for jsh_depothead.OperPersonName - * - * @mbggenerated - */ public void setOperpersonname(String operpersonname) { this.operpersonname = operpersonname == null ? null : operpersonname.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.CreateTime - * - * @return the value of jsh_depothead.CreateTime - * - * @mbggenerated - */ public Date getCreatetime() { return createtime; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.CreateTime - * - * @param createtime the value for jsh_depothead.CreateTime - * - * @mbggenerated - */ public void setCreatetime(Date createtime) { this.createtime = createtime; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OperTime - * - * @return the value of jsh_depothead.OperTime - * - * @mbggenerated - */ public Date getOpertime() { return opertime; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OperTime - * - * @param opertime the value for jsh_depothead.OperTime - * - * @mbggenerated - */ public void setOpertime(Date opertime) { this.opertime = opertime; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OrganId - * - * @return the value of jsh_depothead.OrganId - * - * @mbggenerated - */ public Long getOrganid() { return organid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OrganId - * - * @param organid the value for jsh_depothead.OrganId - * - * @mbggenerated - */ public void setOrganid(Long organid) { this.organid = organid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.HandsPersonId - * - * @return the value of jsh_depothead.HandsPersonId - * - * @mbggenerated - */ public Long getHandspersonid() { return handspersonid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.HandsPersonId - * - * @param handspersonid the value for jsh_depothead.HandsPersonId - * - * @mbggenerated - */ public void setHandspersonid(Long handspersonid) { this.handspersonid = handspersonid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AccountId - * - * @return the value of jsh_depothead.AccountId - * - * @mbggenerated - */ public Long getAccountid() { return accountid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AccountId - * - * @param accountid the value for jsh_depothead.AccountId - * - * @mbggenerated - */ public void setAccountid(Long accountid) { this.accountid = accountid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.ChangeAmount - * - * @return the value of jsh_depothead.ChangeAmount - * - * @mbggenerated - */ public BigDecimal getChangeamount() { return changeamount; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.ChangeAmount - * - * @param changeamount the value for jsh_depothead.ChangeAmount - * - * @mbggenerated - */ public void setChangeamount(BigDecimal changeamount) { this.changeamount = changeamount; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AllocationProjectId - * - * @return the value of jsh_depothead.AllocationProjectId - * - * @mbggenerated - */ public Long getAllocationprojectid() { return allocationprojectid; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AllocationProjectId - * - * @param allocationprojectid the value for jsh_depothead.AllocationProjectId - * - * @mbggenerated - */ public void setAllocationprojectid(Long allocationprojectid) { this.allocationprojectid = allocationprojectid; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.TotalPrice - * - * @return the value of jsh_depothead.TotalPrice - * - * @mbggenerated - */ public BigDecimal getTotalprice() { return totalprice; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.TotalPrice - * - * @param totalprice the value for jsh_depothead.TotalPrice - * - * @mbggenerated - */ public void setTotalprice(BigDecimal totalprice) { this.totalprice = totalprice; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.PayType - * - * @return the value of jsh_depothead.PayType - * - * @mbggenerated - */ public String getPaytype() { return paytype; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.PayType - * - * @param paytype the value for jsh_depothead.PayType - * - * @mbggenerated - */ public void setPaytype(String paytype) { this.paytype = paytype == null ? null : paytype.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Remark - * - * @return the value of jsh_depothead.Remark - * - * @mbggenerated - */ public String getRemark() { return remark; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Remark - * - * @param remark the value for jsh_depothead.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_depothead.Salesman - * - * @return the value of jsh_depothead.Salesman - * - * @mbggenerated - */ public String getSalesman() { return salesman; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Salesman - * - * @param salesman the value for jsh_depothead.Salesman - * - * @mbggenerated - */ public void setSalesman(String salesman) { this.salesman = salesman == null ? null : salesman.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AccountIdList - * - * @return the value of jsh_depothead.AccountIdList - * - * @mbggenerated - */ public String getAccountidlist() { return accountidlist; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AccountIdList - * - * @param accountidlist the value for jsh_depothead.AccountIdList - * - * @mbggenerated - */ public void setAccountidlist(String accountidlist) { this.accountidlist = accountidlist == null ? null : accountidlist.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AccountMoneyList - * - * @return the value of jsh_depothead.AccountMoneyList - * - * @mbggenerated - */ public String getAccountmoneylist() { return accountmoneylist; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AccountMoneyList - * - * @param accountmoneylist the value for jsh_depothead.AccountMoneyList - * - * @mbggenerated - */ public void setAccountmoneylist(String accountmoneylist) { this.accountmoneylist = accountmoneylist == null ? null : accountmoneylist.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Discount - * - * @return the value of jsh_depothead.Discount - * - * @mbggenerated - */ public BigDecimal getDiscount() { return discount; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Discount - * - * @param discount the value for jsh_depothead.Discount - * - * @mbggenerated - */ public void setDiscount(BigDecimal discount) { this.discount = discount; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.DiscountMoney - * - * @return the value of jsh_depothead.DiscountMoney - * - * @mbggenerated - */ public BigDecimal getDiscountmoney() { return discountmoney; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.DiscountMoney - * - * @param discountmoney the value for jsh_depothead.DiscountMoney - * - * @mbggenerated - */ public void setDiscountmoney(BigDecimal discountmoney) { this.discountmoney = discountmoney; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.DiscountLastMoney - * - * @return the value of jsh_depothead.DiscountLastMoney - * - * @mbggenerated - */ public BigDecimal getDiscountlastmoney() { return discountlastmoney; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.DiscountLastMoney - * - * @param discountlastmoney the value for jsh_depothead.DiscountLastMoney - * - * @mbggenerated - */ public void setDiscountlastmoney(BigDecimal discountlastmoney) { this.discountlastmoney = discountlastmoney; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OtherMoney - * - * @return the value of jsh_depothead.OtherMoney - * - * @mbggenerated - */ public BigDecimal getOthermoney() { return othermoney; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OtherMoney - * - * @param othermoney the value for jsh_depothead.OtherMoney - * - * @mbggenerated - */ public void setOthermoney(BigDecimal othermoney) { this.othermoney = othermoney; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OtherMoneyList - * - * @return the value of jsh_depothead.OtherMoneyList - * - * @mbggenerated - */ public String getOthermoneylist() { return othermoneylist; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OtherMoneyList - * - * @param othermoneylist the value for jsh_depothead.OtherMoneyList - * - * @mbggenerated - */ public void setOthermoneylist(String othermoneylist) { this.othermoneylist = othermoneylist == null ? null : othermoneylist.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.OtherMoneyItem - * - * @return the value of jsh_depothead.OtherMoneyItem - * - * @mbggenerated - */ public String getOthermoneyitem() { return othermoneyitem; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.OtherMoneyItem - * - * @param othermoneyitem the value for jsh_depothead.OtherMoneyItem - * - * @mbggenerated - */ public void setOthermoneyitem(String othermoneyitem) { this.othermoneyitem = othermoneyitem == null ? null : othermoneyitem.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.AccountDay - * - * @return the value of jsh_depothead.AccountDay - * - * @mbggenerated - */ public Integer getAccountday() { return accountday; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.AccountDay - * - * @param accountday the value for jsh_depothead.AccountDay - * - * @mbggenerated - */ public void setAccountday(Integer accountday) { this.accountday = accountday; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.Status - * - * @return the value of jsh_depothead.Status - * - * @mbggenerated - */ public String getStatus() { return status; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.Status - * - * @param status the value for jsh_depothead.Status - * - * @mbggenerated - */ public void setStatus(String status) { this.status = status == null ? null : status.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.LinkNumber - * - * @return the value of jsh_depothead.LinkNumber - * - * @mbggenerated - */ public String getLinknumber() { return linknumber; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.LinkNumber - * - * @param linknumber the value for jsh_depothead.LinkNumber - * - * @mbggenerated - */ public void setLinknumber(String linknumber) { this.linknumber = linknumber == null ? null : linknumber.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.tenant_id - * - * @return the value of jsh_depothead.tenant_id - * - * @mbggenerated - */ public Long getTenantId() { return tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_depothead.tenant_id - * - * @param tenantId the value for jsh_depothead.tenant_id - * - * @mbggenerated - */ public void setTenantId(Long tenantId) { this.tenantId = tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_depothead.delete_Flag - * - * @return the value of jsh_depothead.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_depothead.delete_Flag - * - * @param deleteFlag the value for jsh_depothead.delete_Flag - * - * @mbggenerated - */ public void setDeleteFlag(String deleteFlag) { this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); } diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java index a136789c27..31e7b67fc5 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java @@ -6,118 +6,46 @@ import java.util.List; public class DepotHeadExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_depothead - * - * @mbggenerated - */ protected String orderByClause; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_depothead - * - * @mbggenerated - */ protected boolean distinct; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_depothead - * - * @mbggenerated - */ protected List oredCriteria; - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public DepotHeadExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public String getOrderByClause() { return orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public void setDistinct(boolean distinct) { this.distinct = distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public boolean isDistinct() { return distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public List getOredCriteria() { return oredCriteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ public void or(Criteria criteria) { oredCriteria.add(criteria); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @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_depothead - * - * @mbggenerated - */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); if (oredCriteria.size() == 0) { @@ -126,41 +54,23 @@ public Criteria createCriteria() { return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @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_depothead - * - * @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_depothead - * - * @mbggenerated - */ protected abstract static class GeneratedCriteria { protected List criteria; protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -2207,25 +2117,12 @@ public Criteria andDeleteFlagNotBetween(String value1, String value2) { } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_depothead - * - * @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_depothead - * - * @mbggenerated - */ public static class Criterion { private String condition; diff --git a/src/main/java/com/jsh/erp/datasource/entities/User.java b/src/main/java/com/jsh/erp/datasource/entities/User.java index 9dc33723de..a1142f4392 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/User.java +++ b/src/main/java/com/jsh/erp/datasource/entities/User.java @@ -1,450 +1,142 @@ package com.jsh.erp.datasource.entities; public class User { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.id - * - * @mbggenerated - */ private Long id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.username - * - * @mbggenerated - */ private String username; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.loginame - * - * @mbggenerated - */ private String loginame; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.password - * - * @mbggenerated - */ private String password; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.position - * - * @mbggenerated - */ private String position; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.department - * - * @mbggenerated - */ private String department; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.email - * - * @mbggenerated - */ private String email; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.phonenum - * - * @mbggenerated - */ private String phonenum; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.ismanager - * - * @mbggenerated - */ private Byte ismanager; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.isystem - * - * @mbggenerated - */ private Byte isystem; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.Status - * - * @mbggenerated - */ private Byte status; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.description - * - * @mbggenerated - */ private String description; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.remark - * - * @mbggenerated - */ private String remark; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_user.tenant_id - * - * @mbggenerated - */ private Long tenantId; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.id - * - * @return the value of jsh_user.id - * - * @mbggenerated - */ public Long getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.id - * - * @param id the value for jsh_user.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_user.username - * - * @return the value of jsh_user.username - * - * @mbggenerated - */ public String getUsername() { return username; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.username - * - * @param username the value for jsh_user.username - * - * @mbggenerated - */ public void setUsername(String username) { this.username = username == null ? null : username.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.loginame - * - * @return the value of jsh_user.loginame - * - * @mbggenerated - */ public String getLoginame() { return loginame; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.loginame - * - * @param loginame the value for jsh_user.loginame - * - * @mbggenerated - */ public void setLoginame(String loginame) { this.loginame = loginame == null ? null : loginame.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.password - * - * @return the value of jsh_user.password - * - * @mbggenerated - */ public String getPassword() { return password; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.password - * - * @param password the value for jsh_user.password - * - * @mbggenerated - */ public void setPassword(String password) { this.password = password == null ? null : password.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.position - * - * @return the value of jsh_user.position - * - * @mbggenerated - */ public String getPosition() { return position; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.position - * - * @param position the value for jsh_user.position - * - * @mbggenerated - */ public void setPosition(String position) { this.position = position == null ? null : position.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.department - * - * @return the value of jsh_user.department - * - * @mbggenerated - */ public String getDepartment() { return department; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.department - * - * @param department the value for jsh_user.department - * - * @mbggenerated - */ public void setDepartment(String department) { this.department = department == null ? null : department.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.email - * - * @return the value of jsh_user.email - * - * @mbggenerated - */ public String getEmail() { return email; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.email - * - * @param email the value for jsh_user.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_user.phonenum - * - * @return the value of jsh_user.phonenum - * - * @mbggenerated - */ public String getPhonenum() { return phonenum; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.phonenum - * - * @param phonenum the value for jsh_user.phonenum - * - * @mbggenerated - */ 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_user.ismanager - * - * @return the value of jsh_user.ismanager - * - * @mbggenerated - */ public Byte getIsmanager() { return ismanager; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.ismanager - * - * @param ismanager the value for jsh_user.ismanager - * - * @mbggenerated - */ public void setIsmanager(Byte ismanager) { this.ismanager = ismanager; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.isystem - * - * @return the value of jsh_user.isystem - * - * @mbggenerated - */ public Byte getIsystem() { return isystem; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.isystem - * - * @param isystem the value for jsh_user.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_user.Status - * - * @return the value of jsh_user.Status - * - * @mbggenerated - */ public Byte getStatus() { return status; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.Status - * - * @param status the value for jsh_user.Status - * - * @mbggenerated - */ public void setStatus(Byte status) { this.status = status; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_user.description - * - * @return the value of jsh_user.description - * - * @mbggenerated - */ public String getDescription() { return description; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.description - * - * @param description the value for jsh_user.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_user.remark - * - * @return the value of jsh_user.remark - * - * @mbggenerated - */ public String getRemark() { return remark; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.remark - * - * @param remark the value for jsh_user.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_user.tenant_id - * - * @return the value of jsh_user.tenant_id - * - * @mbggenerated - */ public Long getTenantId() { return tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_user.tenant_id - * - * @param tenantId the value for jsh_user.tenant_id - * - * @mbggenerated - */ public void setTenantId(Long tenantId) { this.tenantId = tenantId; } diff --git a/src/main/java/com/jsh/erp/datasource/entities/UserExample.java b/src/main/java/com/jsh/erp/datasource/entities/UserExample.java index aa5e9d0b46..cb46db27a5 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/UserExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/UserExample.java @@ -4,118 +4,46 @@ import java.util.List; public class UserExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_user - * - * @mbggenerated - */ protected String orderByClause; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_user - * - * @mbggenerated - */ protected boolean distinct; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_user - * - * @mbggenerated - */ protected List oredCriteria; - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public UserExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public String getOrderByClause() { return orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public void setDistinct(boolean distinct) { this.distinct = distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public boolean isDistinct() { return distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public List getOredCriteria() { return oredCriteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ public void or(Criteria criteria) { oredCriteria.add(criteria); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @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_user - * - * @mbggenerated - */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); if (oredCriteria.size() == 0) { @@ -124,41 +52,23 @@ public Criteria createCriteria() { return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @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_user - * - * @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_user - * - * @mbggenerated - */ protected abstract static class GeneratedCriteria { protected List criteria; protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -1125,25 +1035,12 @@ public Criteria andTenantIdNotBetween(Long value1, Long value2) { } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_user - * - * @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_user - * - * @mbggenerated - */ public static class Criterion { private String condition; diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java index 8c6ed180b3..efdc4d878f 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java @@ -6,91 +6,25 @@ import org.apache.ibatis.annotations.Param; public interface DepotHeadMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ - int countByExample(DepotHeadExample example); + long countByExample(DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int deleteByExample(DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int deleteByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int insert(DepotHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int insertSelective(DepotHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ List selectByExample(DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ DepotHead selectByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int updateByPrimaryKeySelective(DepotHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depothead - * - * @mbggenerated - */ int updateByPrimaryKey(DepotHead record); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 7db0e03639..210e27bc4b 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -102,14 +102,6 @@ BigDecimal findAllMoney( List getDetailByNumber( @Param("number") String number); - /** - * 新增单据主表信息，并反显单据主表id - * */ - int adddepotHead(DepotHead depotHead); - /** - * 更新单据主表信息 - * */ - void updatedepotHead(DepotHead depotHead); void updateBuildOnlyNumber(); /** diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java index d23e2bae3f..a6b9e79c5e 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java @@ -6,91 +6,25 @@ import org.apache.ibatis.annotations.Param; public interface UserMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ - int countByExample(UserExample example); + long countByExample(UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int deleteByExample(UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int deleteByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int insert(User record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int insertSelective(User record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ List selectByExample(UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ User selectByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int updateByExample(@Param("record") User record, @Param("example") UserExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int updateByPrimaryKeySelective(User record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_user - * - * @mbggenerated - */ int updateByPrimaryKey(User record); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java index 7f768bfc90..a88cc133c1 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java @@ -25,10 +25,6 @@ Long countsByUser( List getUserList(Map parameterMap); - int addUser(UserEx ue); - - int updateUser(UserEx ue); - List getUserListByUserNameOrLoginName(@Param("userName") String userName, @Param("loginame") String loginame); diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 59a36be13a..e5fb636bb2 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -464,8 +464,6 @@ public List getDetailByNumber(String number)throws Exception { } /** - * create by: cjl - * description: * 新增单据主表及单据子表信息 * create time: 2019/1/25 14:36 * @Param: beanJson @@ -489,19 +487,25 @@ public void addDepotHeadAndDetail(String beanJson, String inserted, String delet depotHead.setCreatetime(new Timestamp(System.currentTimeMillis())); depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT); try{ - depotHeadMapperEx.adddepotHead(depotHead); + depotHeadMapper.insertSelective(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())); } } - /**入库和出库处理单据子表信息*/ - depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId(),tenantId, request); + //根据单据编号查询单据id + DepotHeadExample dhExample = new DepotHeadExample(); + dhExample.createCriteria().andDefaultnumberEqualTo(depotHead.getDefaultnumber()).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + List list = depotHeadMapper.selectByExample(dhExample); + if(list!=null) { + Long headId = list.get(0).getId(); + /**入库和出库处理单据子表信息*/ + depotItemService.saveDetials(inserted,deleted,updated,headId,tenantId, request); + } /**如果关联单据号非空则更新订单的状态为2 */ if(depotHead.getLinknumber()!=null) { DepotHead depotHeadOrders = new DepotHead(); @@ -516,8 +520,6 @@ public void addDepotHeadAndDetail(String beanJson, String inserted, String delet } } /** - * create by: cjl - * description: * 更新单据主表及单据子表信息 * create time: 2019/1/28 14:47 * @Param: id @@ -542,7 +544,7 @@ public void updateDepotHeadAndDetail(Long id, String beanJson, String inserted, depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername()); depotHead.setOpertime(new Timestamp(System.currentTimeMillis())); try{ - depotHeadMapperEx.updatedepotHead(depotHead); + depotHeadMapper.updateByPrimaryKeySelective(depotHead); }catch(Exception e){ JshException.writeFail(logger, e); } diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java index 27573681b1..dddef5c979 100644 --- a/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/src/main/java/com/jsh/erp/service/user/UserService.java @@ -334,8 +334,14 @@ public void addUserAndOrgUserRel(UserEx ue) throws Exception{ OrgaUserRel oul=new OrgaUserRel(); //机构id oul.setOrgaId(ue.getOrgaId()); - //用户id - oul.setUserId(ue.getId()); + //用户id，根据用户名查询id + UserExample example = new UserExample(); + example.createCriteria().andLoginameEqualTo(ue.getLoginame()); + List list = userMapper.selectByExample(example); + if(list!=null) { + Long userId = list.get(0).getId(); + oul.setUserId(userId); + } //用户在机构中的排序 oul.setUserBlngOrgaDsplSeq(ue.getUserBlngOrgaDsplSeq()); @@ -365,7 +371,7 @@ public UserEx addUser(UserEx ue) throws Exception{ ue.setStatus(BusinessConstants.USER_STATUS_NORMAL); int result=0; try{ - result= userMapperEx.addUser(ue); + result= userMapper.insertSelective(ue); }catch(Exception e){ JshException.writeFail(logger, e); } @@ -396,7 +402,7 @@ public UserEx registerUser(UserEx ue, Integer manageRoleId, HttpServletRequest r ue.setStatus(BusinessConstants.USER_STATUS_NORMAL); int result=0; try{ - result= userMapperEx.addUser(ue); + result= userMapper.insertSelective(ue); }catch(Exception e){ JshException.writeFail(logger, e); } @@ -490,7 +496,7 @@ public void updateUserAndOrgUserRel(UserEx ue) throws Exception{ public UserEx updateUser(UserEx ue)throws Exception{ int result =0; try{ - result=userMapperEx.updateUser(ue); + result=userMapper.updateByPrimaryKeySelective(ue); }catch(Exception e){ JshException.writeFail(logger, e); } diff --git a/src/main/resources/mapper_xml/DepotHeadMapper.xml b/src/main/resources/mapper_xml/DepotHeadMapper.xml index 17b6e23fcb..e199299cca 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapper.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapper.xml @@ -2,10 +2,6 @@ - @@ -39,10 +35,6 @@ - @@ -72,10 +64,6 @@ - @@ -105,10 +93,6 @@ - Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, @@ -116,10 +100,6 @@ LinkNumber, tenant_id, delete_Flag - delete from jsh_depothead where Id = #{id,jdbcType=BIGINT} - delete from jsh_depothead - insert into jsh_depothead (Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, OperTime, @@ -190,10 +154,6 @@ #{deleteFlag,jdbcType=VARCHAR}) - insert into jsh_depothead @@ -386,21 +346,13 @@ - select count(*) from jsh_depothead - update jsh_depothead @@ -502,10 +454,6 @@ - update jsh_depothead set Id = #{record.id,jdbcType=BIGINT}, Type = #{record.type,jdbcType=VARCHAR}, @@ -543,10 +491,6 @@ - update jsh_depothead @@ -643,10 +587,6 @@ where Id = #{id,jdbcType=BIGINT} - update jsh_depothead set Type = #{type,jdbcType=VARCHAR}, SubType = #{subtype,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 40c19df4fb..d222bf831c 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -324,117 +324,6 @@ and ifnull(dh.delete_Flag,'0') !='1' - - insert into jsh_depothead (Type, SubType, - ProjectId, DefaultNumber, Number, - OperPersonName, CreateTime, OperTime, - OrganId, HandsPersonId, AccountId, - ChangeAmount, AllocationProjectId, TotalPrice, - PayType, Remark, Salesman, - AccountIdList, AccountMoneyList, Discount, - DiscountMoney, DiscountLastMoney, OtherMoney, - OtherMoneyList, OtherMoneyItem, AccountDay, - Status, LinkNumber) - values (#{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, - #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, - #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, - #{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, - #{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL}, - #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR}, - #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, - #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, - #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, - #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}) - - - update jsh_depothead - - - Type = #{type,jdbcType=VARCHAR}, - - - SubType = #{subtype,jdbcType=VARCHAR}, - - - ProjectId = #{projectid,jdbcType=BIGINT}, - - - DefaultNumber = #{defaultnumber,jdbcType=VARCHAR}, - - - Number = #{number,jdbcType=VARCHAR}, - - - OperPersonName = #{operpersonname,jdbcType=VARCHAR}, - - - OperTime = #{opertime,jdbcType=TIMESTAMP}, - - - OrganId = #{organid,jdbcType=BIGINT}, - - - HandsPersonId = #{handspersonid,jdbcType=BIGINT}, - - - AccountId = #{accountid,jdbcType=BIGINT}, - - - ChangeAmount = #{changeamount,jdbcType=DECIMAL}, - - - AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT}, - - - TotalPrice = #{totalprice,jdbcType=DECIMAL}, - - - PayType = #{paytype,jdbcType=VARCHAR}, - - - Remark = #{remark,jdbcType=VARCHAR}, - - - Salesman = #{salesman,jdbcType=VARCHAR}, - - - AccountIdList = #{accountidlist,jdbcType=VARCHAR}, - - - AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR}, - - - Discount = #{discount,jdbcType=DECIMAL}, - - - DiscountMoney = #{discountmoney,jdbcType=DECIMAL}, - - - DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL}, - - - OtherMoney = #{othermoney,jdbcType=DECIMAL}, - - - OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR}, - - - OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR}, - - - AccountDay = #{accountday,jdbcType=INTEGER}, - - - Status = #{status,jdbcType=VARCHAR}, - - - LinkNumber = #{linknumber,jdbcType=VARCHAR}, - - - where Id = #{id,jdbcType=BIGINT} - - update jsh_sequence set current_val = current_val + 1 where seq_name = 'depot_number_seq' diff --git a/src/main/resources/mapper_xml/UserMapper.xml b/src/main/resources/mapper_xml/UserMapper.xml index 1d244e9ce2..88f3e4aa58 100644 --- a/src/main/resources/mapper_xml/UserMapper.xml +++ b/src/main/resources/mapper_xml/UserMapper.xml @@ -2,10 +2,6 @@ - @@ -22,10 +18,6 @@ - @@ -55,10 +47,6 @@ - @@ -88,18 +76,10 @@ - id, username, loginame, password, position, department, email, phonenum, ismanager, isystem, Status, description, remark, tenant_id - delete from jsh_user where id = #{id,jdbcType=BIGINT} - delete from jsh_user - insert into jsh_user (id, username, loginame, password, position, department, email, phonenum, ismanager, @@ -158,10 +122,6 @@ #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}) - insert into jsh_user @@ -252,21 +212,13 @@ - select count(*) from jsh_user - update jsh_user @@ -317,10 +269,6 @@ - update jsh_user set id = #{record.id,jdbcType=BIGINT}, username = #{record.username,jdbcType=VARCHAR}, @@ -341,10 +289,6 @@ - update jsh_user @@ -390,10 +334,6 @@ where id = #{id,jdbcType=BIGINT} - update jsh_user set username = #{username,jdbcType=VARCHAR}, loginame = #{loginame,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper_xml/UserMapperEx.xml b/src/main/resources/mapper_xml/UserMapperEx.xml index 778ed9d556..178329942f 100644 --- a/src/main/resources/mapper_xml/UserMapperEx.xml +++ b/src/main/resources/mapper_xml/UserMapperEx.xml @@ -54,61 +54,6 @@ order by user.id desc - - insert into jsh_user (username, loginame, - password, position, - email, phonenum, ismanager, - isystem, status, description, - remark) - values (#{username,jdbcType=VARCHAR}, #{loginame,jdbcType=VARCHAR}, - #{password,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, - #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{ismanager,jdbcType=TINYINT}, - #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}) - - - update jsh_user - - - username = #{username,jdbcType=VARCHAR}, - - - loginame = #{loginame,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - position = #{position,jdbcType=VARCHAR}, - - - department = #{department,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - phonenum = #{phonenum,jdbcType=VARCHAR}, - - - ismanager = #{ismanager,jdbcType=TINYINT}, - - - isystem = #{isystem,jdbcType=TINYINT}, - - - status = #{status,jdbcType=TINYINT}, - - - description = #{description,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} -