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

从远程仓库更新

Browse Source
This commit is contained in:
qiankunpingtai
2019-03-12 16:42:28 +08:00
parent c868c071c9 2195b8bf25
commit 0d6f14490f
29 changed files with 4516 additions and 3700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View File

@@ -51,6 +51,12 @@ public class BusinessConstants {
* */
public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1";
public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0";
/**
* 单据状态 billsStatus '0'未审核 '1'审核 '2'已转采购|销售
* */
public static final String BILLS_STATUS_UN_AUDIT = "0";
public static final String BILLS_STATUS_AUDIT = "1";
public static final String BILLS_STATUS_SKIP = "2";
/**
* 出入库分类
*采购、采购退货、其它、零售、销售、调拨

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

@@ -51,7 +51,7 @@ public class DepotHeadController {
* @return
*/
@PostMapping(value = "/batchSetStatus")
public String batchSetStatus(@RequestParam("status") Boolean status,
public String batchSetStatus(@RequestParam("status") String status,
@RequestParam("depotHeadIDs") String depotHeadIDs,
HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>();
@@ -64,20 +64,12 @@ public class DepotHeadController {
}
/**
* 单据编号生成接口，规则：查找当前类型单据下的当天最大的单据号，并加1
* @param type
* @param subType
* @param beginTime
* @param endTime
* 单据编号生成接口
* @param request
* @return
*/
@GetMapping(value = "/buildNumber")
public BaseResponseInfo buildNumber(@RequestParam("type") String type,
@RequestParam("subType") String subType,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
HttpServletRequest request) {
public BaseResponseInfo buildNumber(HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@@ -11,35 +11,51 @@ public class SystemConfig {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.type
* This field corresponds to the database column jsh_systemconfig.company_name
*
* @mbggenerated
*/
private String type;
private String companyName;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.name
* This field corresponds to the database column jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
private String name;
private String companyContacts;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.value
* This field corresponds to the database column jsh_systemconfig.company_address
*
* @mbggenerated
*/
private String value;
private String companyAddress;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.description
* This field corresponds to the database column jsh_systemconfig.company_tel
*
* @mbggenerated
*/
private String description;
private String companyTel;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.company_fax
*
* @mbggenerated
*/
private String companyFax;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
private String companyPostCode;
/**
* This method was generated by MyBatis Generator.
@@ -67,97 +83,145 @@ public class SystemConfig {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.type
* This method returns the value of the database column jsh_systemconfig.company_name
*
* @return the value of jsh_systemconfig.type
* @return the value of jsh_systemconfig.company_name
*
* @mbggenerated
*/
public String getType() {
return type;
public String getCompanyName() {
return companyName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.type
* This method sets the value of the database column jsh_systemconfig.company_name
*
* @param type the value for jsh_systemconfig.type
* @param companyName the value for jsh_systemconfig.company_name
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
public void setCompanyName(String companyName) {
this.companyName = companyName == null ? null : companyName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.name
* This method returns the value of the database column jsh_systemconfig.company_contacts
*
* @return the value of jsh_systemconfig.name
* @return the value of jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public String getName() {
return name;
public String getCompanyContacts() {
return companyContacts;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.name
* This method sets the value of the database column jsh_systemconfig.company_contacts
*
* @param name the value for jsh_systemconfig.name
* @param companyContacts the value for jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
public void setCompanyContacts(String companyContacts) {
this.companyContacts = companyContacts == null ? null : companyContacts.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.value
* This method returns the value of the database column jsh_systemconfig.company_address
*
* @return the value of jsh_systemconfig.value
* @return the value of jsh_systemconfig.company_address
*
* @mbggenerated
*/
public String getValue() {
return value;
public String getCompanyAddress() {
return companyAddress;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.value
* This method sets the value of the database column jsh_systemconfig.company_address
*
* @param value the value for jsh_systemconfig.value
* @param companyAddress the value for jsh_systemconfig.company_address
*
* @mbggenerated
*/
public void setValue(String value) {
this.value = value == null ? null : value.trim();
public void setCompanyAddress(String companyAddress) {
this.companyAddress = companyAddress == null ? null : companyAddress.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.description
* This method returns the value of the database column jsh_systemconfig.company_tel
*
* @return the value of jsh_systemconfig.description
* @return the value of jsh_systemconfig.company_tel
*
* @mbggenerated
*/
public String getDescription() {
return description;
public String getCompanyTel() {
return companyTel;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.description
* This method sets the value of the database column jsh_systemconfig.company_tel
*
* @param description the value for jsh_systemconfig.description
* @param companyTel the value for jsh_systemconfig.company_tel
*
* @mbggenerated
*/
public void setDescription(String description) {
this.description = description == null ? null : description.trim();
public void setCompanyTel(String companyTel) {
this.companyTel = companyTel == null ? null : companyTel.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.company_fax
*
* @return the value of jsh_systemconfig.company_fax
*
* @mbggenerated
*/
public String getCompanyFax() {
return companyFax;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_fax
*
* @param companyFax the value for jsh_systemconfig.company_fax
*
* @mbggenerated
*/
public void setCompanyFax(String companyFax) {
this.companyFax = companyFax == null ? null : companyFax.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.company_post_code
*
* @return the value of jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
public String getCompanyPostCode() {
return companyPostCode;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_post_code
*
* @param companyPostCode the value for jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
public void setCompanyPostCode(String companyPostCode) {
this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim();
}
}

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

@@ -254,283 +254,423 @@ public class SystemConfigExample {
return (Criteria) this;
}
public Criteria andTypeIsNull() {
addCriterion("type is null");
public Criteria andCompanyNameIsNull() {
addCriterion("company_name is null");
return (Criteria) this;
}
public Criteria andTypeIsNotNull() {
addCriterion("type is not null");
public Criteria andCompanyNameIsNotNull() {
addCriterion("company_name is not null");
return (Criteria) this;
}
public Criteria andTypeEqualTo(String value) {
addCriterion("type =", value, "type");
public Criteria andCompanyNameEqualTo(String value) {
addCriterion("company_name =", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeNotEqualTo(String value) {
addCriterion("type <>", value, "type");
public Criteria andCompanyNameNotEqualTo(String value) {
addCriterion("company_name <>", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeGreaterThan(String value) {
addCriterion("type >", value, "type");
public Criteria andCompanyNameGreaterThan(String value) {
addCriterion("company_name >", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("type >=", value, "type");
public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
addCriterion("company_name >=", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeLessThan(String value) {
addCriterion("type <", value, "type");
public Criteria andCompanyNameLessThan(String value) {
addCriterion("company_name <", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("type <=", value, "type");
public Criteria andCompanyNameLessThanOrEqualTo(String value) {
addCriterion("company_name <=", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeLike(String value) {
addCriterion("type like", value, "type");
public Criteria andCompanyNameLike(String value) {
addCriterion("company_name like", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeNotLike(String value) {
addCriterion("type not like", value, "type");
public Criteria andCompanyNameNotLike(String value) {
addCriterion("company_name not like", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeIn(List<String> values) {
addCriterion("type in", values, "type");
public Criteria andCompanyNameIn(List<String> values) {
addCriterion("company_name in", values, "companyName");
return (Criteria) this;
}
public Criteria andTypeNotIn(List<String> values) {
addCriterion("type not in", values, "type");
public Criteria andCompanyNameNotIn(List<String> values) {
addCriterion("company_name not in", values, "companyName");
return (Criteria) this;
}
public Criteria andTypeBetween(String value1, String value2) {
addCriterion("type between", value1, value2, "type");
public Criteria andCompanyNameBetween(String value1, String value2) {
addCriterion("company_name between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("type not between", value1, value2, "type");
public Criteria andCompanyNameNotBetween(String value1, String value2) {
addCriterion("company_name not between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("name is null");
public Criteria andCompanyContactsIsNull() {
addCriterion("company_contacts is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("name is not null");
public Criteria andCompanyContactsIsNotNull() {
addCriterion("company_contacts is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("name =", value, "name");
public Criteria andCompanyContactsEqualTo(String value) {
addCriterion("company_contacts =", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("name <>", value, "name");
public Criteria andCompanyContactsNotEqualTo(String value) {
addCriterion("company_contacts <>", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("name >", value, "name");
public Criteria andCompanyContactsGreaterThan(String value) {
addCriterion("company_contacts >", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("name >=", value, "name");
public Criteria andCompanyContactsGreaterThanOrEqualTo(String value) {
addCriterion("company_contacts >=", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("name <", value, "name");
public Criteria andCompanyContactsLessThan(String value) {
addCriterion("company_contacts <", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("name <=", value, "name");
public Criteria andCompanyContactsLessThanOrEqualTo(String value) {
addCriterion("company_contacts <=", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("name like", value, "name");
public Criteria andCompanyContactsLike(String value) {
addCriterion("company_contacts like", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("name not like", value, "name");
public Criteria andCompanyContactsNotLike(String value) {
addCriterion("company_contacts not like", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("name in", values, "name");
public Criteria andCompanyContactsIn(List<String> values) {
addCriterion("company_contacts in", values, "companyContacts");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("name not in", values, "name");
public Criteria andCompanyContactsNotIn(List<String> values) {
addCriterion("company_contacts not in", values, "companyContacts");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("name between", value1, value2, "name");
public Criteria andCompanyContactsBetween(String value1, String value2) {
addCriterion("company_contacts between", value1, value2, "companyContacts");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("name not between", value1, value2, "name");
public Criteria andCompanyContactsNotBetween(String value1, String value2) {
addCriterion("company_contacts not between", value1, value2, "companyContacts");
return (Criteria) this;
}
public Criteria andValueIsNull() {
addCriterion("value is null");
public Criteria andCompanyAddressIsNull() {
addCriterion("company_address is null");
return (Criteria) this;
}
public Criteria andValueIsNotNull() {
addCriterion("value is not null");
public Criteria andCompanyAddressIsNotNull() {
addCriterion("company_address is not null");
return (Criteria) this;
}
public Criteria andValueEqualTo(String value) {
addCriterion("value =", value, "value");
public Criteria andCompanyAddressEqualTo(String value) {
addCriterion("company_address =", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueNotEqualTo(String value) {
addCriterion("value <>", value, "value");
public Criteria andCompanyAddressNotEqualTo(String value) {
addCriterion("company_address <>", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueGreaterThan(String value) {
addCriterion("value >", value, "value");
public Criteria andCompanyAddressGreaterThan(String value) {
addCriterion("company_address >", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueGreaterThanOrEqualTo(String value) {
addCriterion("value >=", value, "value");
public Criteria andCompanyAddressGreaterThanOrEqualTo(String value) {
addCriterion("company_address >=", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueLessThan(String value) {
addCriterion("value <", value, "value");
public Criteria andCompanyAddressLessThan(String value) {
addCriterion("company_address <", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueLessThanOrEqualTo(String value) {
addCriterion("value <=", value, "value");
public Criteria andCompanyAddressLessThanOrEqualTo(String value) {
addCriterion("company_address <=", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueLike(String value) {
addCriterion("value like", value, "value");
public Criteria andCompanyAddressLike(String value) {
addCriterion("company_address like", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueNotLike(String value) {
addCriterion("value not like", value, "value");
public Criteria andCompanyAddressNotLike(String value) {
addCriterion("company_address not like", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueIn(List<String> values) {
addCriterion("value in", values, "value");
public Criteria andCompanyAddressIn(List<String> values) {
addCriterion("company_address in", values, "companyAddress");
return (Criteria) this;
}
public Criteria andValueNotIn(List<String> values) {
addCriterion("value not in", values, "value");
public Criteria andCompanyAddressNotIn(List<String> values) {
addCriterion("company_address not in", values, "companyAddress");
return (Criteria) this;
}
public Criteria andValueBetween(String value1, String value2) {
addCriterion("value between", value1, value2, "value");
public Criteria andCompanyAddressBetween(String value1, String value2) {
addCriterion("company_address between", value1, value2, "companyAddress");
return (Criteria) this;
}
public Criteria andValueNotBetween(String value1, String value2) {
addCriterion("value not between", value1, value2, "value");
public Criteria andCompanyAddressNotBetween(String value1, String value2) {
addCriterion("company_address not between", value1, value2, "companyAddress");
return (Criteria) this;
}
public Criteria andDescriptionIsNull() {
addCriterion("description is null");
public Criteria andCompanyTelIsNull() {
addCriterion("company_tel is null");
return (Criteria) this;
}
public Criteria andDescriptionIsNotNull() {
addCriterion("description is not null");
public Criteria andCompanyTelIsNotNull() {
addCriterion("company_tel is not null");
return (Criteria) this;
}
public Criteria andDescriptionEqualTo(String value) {
addCriterion("description =", value, "description");
public Criteria andCompanyTelEqualTo(String value) {
addCriterion("company_tel =", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionNotEqualTo(String value) {
addCriterion("description <>", value, "description");
public Criteria andCompanyTelNotEqualTo(String value) {
addCriterion("company_tel <>", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionGreaterThan(String value) {
addCriterion("description >", value, "description");
public Criteria andCompanyTelGreaterThan(String value) {
addCriterion("company_tel >", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("description >=", value, "description");
public Criteria andCompanyTelGreaterThanOrEqualTo(String value) {
addCriterion("company_tel >=", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionLessThan(String value) {
addCriterion("description <", value, "description");
public Criteria andCompanyTelLessThan(String value) {
addCriterion("company_tel <", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionLessThanOrEqualTo(String value) {
addCriterion("description <=", value, "description");
public Criteria andCompanyTelLessThanOrEqualTo(String value) {
addCriterion("company_tel <=", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionLike(String value) {
addCriterion("description like", value, "description");
public Criteria andCompanyTelLike(String value) {
addCriterion("company_tel like", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionNotLike(String value) {
addCriterion("description not like", value, "description");
public Criteria andCompanyTelNotLike(String value) {
addCriterion("company_tel not like", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionIn(List<String> values) {
addCriterion("description in", values, "description");
public Criteria andCompanyTelIn(List<String> values) {
addCriterion("company_tel in", values, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionNotIn(List<String> values) {
addCriterion("description not in", values, "description");
public Criteria andCompanyTelNotIn(List<String> values) {
addCriterion("company_tel not in", values, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionBetween(String value1, String value2) {
addCriterion("description between", value1, value2, "description");
public Criteria andCompanyTelBetween(String value1, String value2) {
addCriterion("company_tel between", value1, value2, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionNotBetween(String value1, String value2) {
addCriterion("description not between", value1, value2, "description");
public Criteria andCompanyTelNotBetween(String value1, String value2) {
addCriterion("company_tel not between", value1, value2, "companyTel");
return (Criteria) this;
}
public Criteria andCompanyFaxIsNull() {
addCriterion("company_fax is null");
return (Criteria) this;
}
public Criteria andCompanyFaxIsNotNull() {
addCriterion("company_fax is not null");
return (Criteria) this;
}
public Criteria andCompanyFaxEqualTo(String value) {
addCriterion("company_fax =", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxNotEqualTo(String value) {
addCriterion("company_fax <>", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxGreaterThan(String value) {
addCriterion("company_fax >", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxGreaterThanOrEqualTo(String value) {
addCriterion("company_fax >=", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxLessThan(String value) {
addCriterion("company_fax <", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxLessThanOrEqualTo(String value) {
addCriterion("company_fax <=", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxLike(String value) {
addCriterion("company_fax like", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxNotLike(String value) {
addCriterion("company_fax not like", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxIn(List<String> values) {
addCriterion("company_fax in", values, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxNotIn(List<String> values) {
addCriterion("company_fax not in", values, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxBetween(String value1, String value2) {
addCriterion("company_fax between", value1, value2, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxNotBetween(String value1, String value2) {
addCriterion("company_fax not between", value1, value2, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyPostCodeIsNull() {
addCriterion("company_post_code is null");
return (Criteria) this;
}
public Criteria andCompanyPostCodeIsNotNull() {
addCriterion("company_post_code is not null");
return (Criteria) this;
}
public Criteria andCompanyPostCodeEqualTo(String value) {
addCriterion("company_post_code =", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeNotEqualTo(String value) {
addCriterion("company_post_code <>", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeGreaterThan(String value) {
addCriterion("company_post_code >", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeGreaterThanOrEqualTo(String value) {
addCriterion("company_post_code >=", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeLessThan(String value) {
addCriterion("company_post_code <", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeLessThanOrEqualTo(String value) {
addCriterion("company_post_code <=", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeLike(String value) {
addCriterion("company_post_code like", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeNotLike(String value) {
addCriterion("company_post_code not like", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeIn(List<String> values) {
addCriterion("company_post_code in", values, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeNotIn(List<String> values) {
addCriterion("company_post_code not in", values, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeBetween(String value1, String value2) {
addCriterion("company_post_code between", value1, value2, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeNotBetween(String value1, String value2) {
addCriterion("company_post_code not between", value1, value2, "companyPostCode");
return (Criteria) this;
}
}

197
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
View File

@@ -1,103 +1,96 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample;
import java.math.BigDecimal;
import java.util.List;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.jsh.erp.datasource.vo.DepotHeadVo4List;
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
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);
/**
* 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<DepotHead> 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);
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample;
import java.util.List;
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);
/**
* 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<DepotHead> 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);
}

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

@@ -9,8 +9,10 @@ import java.util.List;
public interface SystemConfigMapperEx {
List<SystemConfig> selectByConditionSystemConfig(
@Param("companyName") String companyName,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
Long countsBySystemConfig();
Long countsBySystemConfig(
@Param("companyName") String companyName);
}

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

@@ -59,7 +59,9 @@ public class DepotHeadVo4List {
private Integer accountday;
private Boolean status;
private String status;
private String linknumber;
private String projectName;
@@ -291,14 +293,22 @@ public class DepotHeadVo4List {
this.accountday = accountday;
}
public Boolean getStatus() {
public String getStatus() {
return status;
}
public void setStatus(Boolean status) {
public void setStatus(String status) {
this.status = status;
}
public String getLinknumber() {
return linknumber;
}
public void setLinknumber(String linknumber) {
this.linknumber = linknumber;
}
public String getProjectName() {
return projectName;
}

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

@@ -106,7 +106,7 @@ public class DepotHeadService {
depotHead.setOperpersonname(uName);
}
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(false);
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
return depotHeadMapper.insert(depotHead);
}
@@ -142,7 +142,7 @@ public class DepotHeadService {
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchSetStatus(Boolean status, String depotHeadIDs) {
public int batchSetStatus(String status, String depotHeadIDs) {
List<Long> ids = StringUtil.strToLongList(depotHeadIDs);
DepotHead depotHead = new DepotHead();
depotHead.setStatus(status);
@@ -275,7 +275,7 @@ public class DepotHeadService {
User userInfo=userService.getCurrentUser();
depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(false);
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
depotHeadMapperEx.adddepotHead(depotHead);
/**入库和出库处理预付款信息*/
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
@@ -285,6 +285,14 @@ public class DepotHeadService {
}
/**入库和出库处理单据子表信息*/
depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId());
/**如果关联单据号非空则更新订单的状态为2 */
if(depotHead.getLinknumber()!=null) {
DepotHead depotHeadOrders = new DepotHead();
depotHeadOrders.setStatus(BusinessConstants.BILLS_STATUS_SKIP);
DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andNumberEqualTo(depotHead.getLinknumber());
depotHeadMapper.updateByExampleSelective(depotHeadOrders, example);
}
}
/**
* create by: cjl

8
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java
View File

@@ -31,13 +31,17 @@ public class SystemConfigComponent implements ICommonQuery {
}
private List<?> getSystemConfigList(Map<String, String> map) {
String search = map.get(Constants.SEARCH);
String companyName = StringUtil.getInfo(search, "companyName");
String order = QueryUtils.order(map);
return systemConfigService.select(QueryUtils.offset(map), QueryUtils.rows(map));
return systemConfigService.select(companyName, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
public Long counts(Map<String, String> map) {
return systemConfigService.countSystemConfig();
String search = map.get(Constants.SEARCH);
String companyName = StringUtil.getInfo(search, "companyName");
return systemConfigService.countSystemConfig(companyName);
}
@Override

10
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java
View File

@@ -33,12 +33,12 @@ public class SystemConfigService {
SystemConfigExample example = new SystemConfigExample();
return systemConfigMapper.selectByExample(example);
}
public List<SystemConfig> select(int offset, int rows) {
return systemConfigMapperEx.selectByConditionSystemConfig(offset, rows);
public List<SystemConfig> select(String companyName, int offset, int rows) {
return systemConfigMapperEx.selectByConditionSystemConfig(companyName, offset, rows);
}
public Long countSystemConfig() {
return systemConfigMapperEx.countsBySystemConfig();
public Long countSystemConfig(String companyName) {
return systemConfigMapperEx.countsBySystemConfig(companyName);
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -69,7 +69,7 @@ public class SystemConfigService {
public int checkIsNameExist(Long id, String name) {
SystemConfigExample example = new SystemConfigExample();
example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name);
example.createCriteria().andIdNotEqualTo(id).andCompanyNameEqualTo(name);
List<SystemConfig> list = systemConfigMapper.selectByExample(example);
return list.size();
}