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

优化商品信息的字段

Browse Source
This commit is contained in:
季圣华
2020-05-04 10:28:40 +08:00
parent 3f83d340c1
commit d074471de2
12 changed files with 483 additions and 2011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,10 +331,10 @@ public class MaterialController {
objs[2] = m.getModel();
objs[3] = m.getSafetystock() == null? "" : m.getSafetystock().toString();
objs[4] = m.getUnit();
objs[5] = m.getRetailprice() == null ? "" : m.getRetailprice().toString();
objs[6] = m.getLowprice() == null ? "" : m.getLowprice().toString();
objs[7] = m.getPresetpriceone() == null ? "" : m.getPresetpriceone().toString();
objs[8] = m.getPresetpricetwo() == null ? "" : m.getPresetpricetwo().toString();
objs[5] = "";
objs[6] = "";
objs[7] = "";
objs[8] = "";
objs[9] = m.getRemark();
objs[10] = m.getEnabled() ? "启用" : "禁用";
objects.add(objs);

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

@@ -36,6 +36,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
private String priceStrategy;
private BigDecimal purchaseDecimal;
private String barCode;
public Long getMId() {
@@ -166,6 +168,14 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
this.priceStrategy = priceStrategy;
}
public BigDecimal getPurchaseDecimal() {
return purchaseDecimal;
}
public void setPurchaseDecimal(BigDecimal purchaseDecimal) {
this.purchaseDecimal = purchaseDecimal;
}
public String getBarCode() {
return barCode;
}

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

@@ -3,834 +3,182 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class Material {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.CategoryId
*
* @mbggenerated
*/
private Long categoryid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Mfrs
*
* @mbggenerated
*/
private String mfrs;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Packing
*
* @mbggenerated
*/
private BigDecimal packing;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.SafetyStock
*
* @mbggenerated
*/
private BigDecimal safetystock;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Model
*
* @mbggenerated
*/
private String model;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Standard
*
* @mbggenerated
*/
private String standard;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Color
*
* @mbggenerated
*/
private String color;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Unit
*
* @mbggenerated
*/
private String unit;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.RetailPrice
*
* @mbggenerated
*/
private BigDecimal retailprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.LowPrice
*
* @mbggenerated
*/
private BigDecimal lowprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.PresetPriceOne
*
* @mbggenerated
*/
private BigDecimal presetpriceone;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.PresetPriceTwo
*
* @mbggenerated
*/
private BigDecimal presetpricetwo;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.UnitId
*
* @mbggenerated
*/
private Long unitid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.FirstOutUnit
*
* @mbggenerated
*/
private String firstoutunit;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.FirstInUnit
*
* @mbggenerated
*/
private String firstinunit;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.PriceStrategy
*
* @mbggenerated
*/
private String pricestrategy;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.Enabled
*
* @mbggenerated
*/
private Boolean enabled;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.OtherField1
*
* @mbggenerated
*/
private String otherfield1;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.OtherField2
*
* @mbggenerated
*/
private String otherfield2;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.OtherField3
*
* @mbggenerated
*/
private String otherfield3;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.enableSerialNumber
*
* @mbggenerated
*/
private String enableserialnumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_material.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Id
*
* @return the value of jsh_material.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Id
*
* @param id the value for jsh_material.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_material.CategoryId
*
* @return the value of jsh_material.CategoryId
*
* @mbggenerated
*/
public Long getCategoryid() {
return categoryid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.CategoryId
*
* @param categoryid the value for jsh_material.CategoryId
*
* @mbggenerated
*/
public void setCategoryid(Long categoryid) {
this.categoryid = categoryid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Name
*
* @return the value of jsh_material.Name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Name
*
* @param name the value for jsh_material.Name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Mfrs
*
* @return the value of jsh_material.Mfrs
*
* @mbggenerated
*/
public String getMfrs() {
return mfrs;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Mfrs
*
* @param mfrs the value for jsh_material.Mfrs
*
* @mbggenerated
*/
public void setMfrs(String mfrs) {
this.mfrs = mfrs == null ? null : mfrs.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Packing
*
* @return the value of jsh_material.Packing
*
* @mbggenerated
*/
public BigDecimal getPacking() {
return packing;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Packing
*
* @param packing the value for jsh_material.Packing
*
* @mbggenerated
*/
public void setPacking(BigDecimal packing) {
this.packing = packing;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.SafetyStock
*
* @return the value of jsh_material.SafetyStock
*
* @mbggenerated
*/
public BigDecimal getSafetystock() {
return safetystock;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.SafetyStock
*
* @param safetystock the value for jsh_material.SafetyStock
*
* @mbggenerated
*/
public void setSafetystock(BigDecimal safetystock) {
this.safetystock = safetystock;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Model
*
* @return the value of jsh_material.Model
*
* @mbggenerated
*/
public String getModel() {
return model;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Model
*
* @param model the value for jsh_material.Model
*
* @mbggenerated
*/
public void setModel(String model) {
this.model = model == null ? null : model.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Standard
*
* @return the value of jsh_material.Standard
*
* @mbggenerated
*/
public String getStandard() {
return standard;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Standard
*
* @param standard the value for jsh_material.Standard
*
* @mbggenerated
*/
public void setStandard(String standard) {
this.standard = standard == null ? null : standard.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Color
*
* @return the value of jsh_material.Color
*
* @mbggenerated
*/
public String getColor() {
return color;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Color
*
* @param color the value for jsh_material.Color
*
* @mbggenerated
*/
public void setColor(String color) {
this.color = color == null ? null : color.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Unit
*
* @return the value of jsh_material.Unit
*
* @mbggenerated
*/
public String getUnit() {
return unit;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Unit
*
* @param unit the value for jsh_material.Unit
*
* @mbggenerated
*/
public void setUnit(String unit) {
this.unit = unit == null ? null : unit.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Remark
*
* @return the value of jsh_material.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Remark
*
* @param remark the value for jsh_material.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_material.RetailPrice
*
* @return the value of jsh_material.RetailPrice
*
* @mbggenerated
*/
public BigDecimal getRetailprice() {
return retailprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.RetailPrice
*
* @param retailprice the value for jsh_material.RetailPrice
*
* @mbggenerated
*/
public void setRetailprice(BigDecimal retailprice) {
this.retailprice = retailprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.LowPrice
*
* @return the value of jsh_material.LowPrice
*
* @mbggenerated
*/
public BigDecimal getLowprice() {
return lowprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.LowPrice
*
* @param lowprice the value for jsh_material.LowPrice
*
* @mbggenerated
*/
public void setLowprice(BigDecimal lowprice) {
this.lowprice = lowprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.PresetPriceOne
*
* @return the value of jsh_material.PresetPriceOne
*
* @mbggenerated
*/
public BigDecimal getPresetpriceone() {
return presetpriceone;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.PresetPriceOne
*
* @param presetpriceone the value for jsh_material.PresetPriceOne
*
* @mbggenerated
*/
public void setPresetpriceone(BigDecimal presetpriceone) {
this.presetpriceone = presetpriceone;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.PresetPriceTwo
*
* @return the value of jsh_material.PresetPriceTwo
*
* @mbggenerated
*/
public BigDecimal getPresetpricetwo() {
return presetpricetwo;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.PresetPriceTwo
*
* @param presetpricetwo the value for jsh_material.PresetPriceTwo
*
* @mbggenerated
*/
public void setPresetpricetwo(BigDecimal presetpricetwo) {
this.presetpricetwo = presetpricetwo;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.UnitId
*
* @return the value of jsh_material.UnitId
*
* @mbggenerated
*/
public Long getUnitid() {
return unitid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.UnitId
*
* @param unitid the value for jsh_material.UnitId
*
* @mbggenerated
*/
public void setUnitid(Long unitid) {
this.unitid = unitid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.FirstOutUnit
*
* @return the value of jsh_material.FirstOutUnit
*
* @mbggenerated
*/
public String getFirstoutunit() {
return firstoutunit;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.FirstOutUnit
*
* @param firstoutunit the value for jsh_material.FirstOutUnit
*
* @mbggenerated
*/
public void setFirstoutunit(String firstoutunit) {
this.firstoutunit = firstoutunit == null ? null : firstoutunit.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.FirstInUnit
*
* @return the value of jsh_material.FirstInUnit
*
* @mbggenerated
*/
public String getFirstinunit() {
return firstinunit;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.FirstInUnit
*
* @param firstinunit the value for jsh_material.FirstInUnit
*
* @mbggenerated
*/
public void setFirstinunit(String firstinunit) {
this.firstinunit = firstinunit == null ? null : firstinunit.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.PriceStrategy
*
* @return the value of jsh_material.PriceStrategy
*
* @mbggenerated
*/
public String getPricestrategy() {
return pricestrategy;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.PriceStrategy
*
* @param pricestrategy the value for jsh_material.PriceStrategy
*
* @mbggenerated
*/
public void setPricestrategy(String pricestrategy) {
this.pricestrategy = pricestrategy == null ? null : pricestrategy.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.Enabled
*
* @return the value of jsh_material.Enabled
*
* @mbggenerated
*/
public Boolean getEnabled() {
return enabled;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.Enabled
*
* @param enabled the value for jsh_material.Enabled
*
* @mbggenerated
*/
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.OtherField1
*
* @return the value of jsh_material.OtherField1
*
* @mbggenerated
*/
public String getOtherfield1() {
return otherfield1;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.OtherField1
*
* @param otherfield1 the value for jsh_material.OtherField1
*
* @mbggenerated
*/
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1 == null ? null : otherfield1.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.OtherField2
*
* @return the value of jsh_material.OtherField2
*
* @mbggenerated
*/
public String getOtherfield2() {
return otherfield2;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.OtherField2
*
* @param otherfield2 the value for jsh_material.OtherField2
*
* @mbggenerated
*/
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2 == null ? null : otherfield2.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.OtherField3
*
* @return the value of jsh_material.OtherField3
*
* @mbggenerated
*/
public String getOtherfield3() {
return otherfield3;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.OtherField3
*
* @param otherfield3 the value for jsh_material.OtherField3
*
* @mbggenerated
*/
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.enableSerialNumber
*
* @return the value of jsh_material.enableSerialNumber
*
* @mbggenerated
*/
public String getEnableserialnumber() {
return enableserialnumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_material.enableSerialNumber
*
* @param enableserialnumber the value for jsh_material.enableSerialNumber
*
* @mbggenerated
*/
public void setEnableserialnumber(String enableserialnumber) {
this.enableserialnumber = enableserialnumber == null ? null : enableserialnumber.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_material.tenant_id
*
* @return the value of jsh_material.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_material.tenant_id
*
* @param tenantId the value for jsh_material.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_material.delete_Flag
*
* @return the value of jsh_material.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_material.delete_Flag
*
* @param deleteFlag the value for jsh_material.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}

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

@@ -5,118 +5,46 @@ import java.util.ArrayList;
import java.util.List;
public class MaterialExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_material
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_material
*
* @mbggenerated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_material
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
public MaterialExample() {
oredCriteria = new ArrayList<Criteria>();
oredCriteria = new ArrayList<>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @mbggenerated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @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_material
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class MaterialExample {
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_material
*
* @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_material
*
* @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_material
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -455,66 +365,6 @@ public class MaterialExample {
return (Criteria) this;
}
public Criteria andPackingIsNull() {
addCriterion("Packing is null");
return (Criteria) this;
}
public Criteria andPackingIsNotNull() {
addCriterion("Packing is not null");
return (Criteria) this;
}
public Criteria andPackingEqualTo(BigDecimal value) {
addCriterion("Packing =", value, "packing");
return (Criteria) this;
}
public Criteria andPackingNotEqualTo(BigDecimal value) {
addCriterion("Packing <>", value, "packing");
return (Criteria) this;
}
public Criteria andPackingGreaterThan(BigDecimal value) {
addCriterion("Packing >", value, "packing");
return (Criteria) this;
}
public Criteria andPackingGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("Packing >=", value, "packing");
return (Criteria) this;
}
public Criteria andPackingLessThan(BigDecimal value) {
addCriterion("Packing <", value, "packing");
return (Criteria) this;
}
public Criteria andPackingLessThanOrEqualTo(BigDecimal value) {
addCriterion("Packing <=", value, "packing");
return (Criteria) this;
}
public Criteria andPackingIn(List<BigDecimal> values) {
addCriterion("Packing in", values, "packing");
return (Criteria) this;
}
public Criteria andPackingNotIn(List<BigDecimal> values) {
addCriterion("Packing not in", values, "packing");
return (Criteria) this;
}
public Criteria andPackingBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Packing between", value1, value2, "packing");
return (Criteria) this;
}
public Criteria andPackingNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Packing not between", value1, value2, "packing");
return (Criteria) this;
}
public Criteria andSafetystockIsNull() {
addCriterion("SafetyStock is null");
return (Criteria) this;
@@ -925,246 +775,6 @@ public class MaterialExample {
return (Criteria) this;
}
public Criteria andRetailpriceIsNull() {
addCriterion("RetailPrice is null");
return (Criteria) this;
}
public Criteria andRetailpriceIsNotNull() {
addCriterion("RetailPrice is not null");
return (Criteria) this;
}
public Criteria andRetailpriceEqualTo(BigDecimal value) {
addCriterion("RetailPrice =", value, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceNotEqualTo(BigDecimal value) {
addCriterion("RetailPrice <>", value, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceGreaterThan(BigDecimal value) {
addCriterion("RetailPrice >", value, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("RetailPrice >=", value, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceLessThan(BigDecimal value) {
addCriterion("RetailPrice <", value, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("RetailPrice <=", value, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceIn(List<BigDecimal> values) {
addCriterion("RetailPrice in", values, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceNotIn(List<BigDecimal> values) {
addCriterion("RetailPrice not in", values, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("RetailPrice between", value1, value2, "retailprice");
return (Criteria) this;
}
public Criteria andRetailpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("RetailPrice not between", value1, value2, "retailprice");
return (Criteria) this;
}
public Criteria andLowpriceIsNull() {
addCriterion("LowPrice is null");
return (Criteria) this;
}
public Criteria andLowpriceIsNotNull() {
addCriterion("LowPrice is not null");
return (Criteria) this;
}
public Criteria andLowpriceEqualTo(BigDecimal value) {
addCriterion("LowPrice =", value, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceNotEqualTo(BigDecimal value) {
addCriterion("LowPrice <>", value, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceGreaterThan(BigDecimal value) {
addCriterion("LowPrice >", value, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("LowPrice >=", value, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceLessThan(BigDecimal value) {
addCriterion("LowPrice <", value, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("LowPrice <=", value, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceIn(List<BigDecimal> values) {
addCriterion("LowPrice in", values, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceNotIn(List<BigDecimal> values) {
addCriterion("LowPrice not in", values, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("LowPrice between", value1, value2, "lowprice");
return (Criteria) this;
}
public Criteria andLowpriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("LowPrice not between", value1, value2, "lowprice");
return (Criteria) this;
}
public Criteria andPresetpriceoneIsNull() {
addCriterion("PresetPriceOne is null");
return (Criteria) this;
}
public Criteria andPresetpriceoneIsNotNull() {
addCriterion("PresetPriceOne is not null");
return (Criteria) this;
}
public Criteria andPresetpriceoneEqualTo(BigDecimal value) {
addCriterion("PresetPriceOne =", value, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneNotEqualTo(BigDecimal value) {
addCriterion("PresetPriceOne <>", value, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneGreaterThan(BigDecimal value) {
addCriterion("PresetPriceOne >", value, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("PresetPriceOne >=", value, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneLessThan(BigDecimal value) {
addCriterion("PresetPriceOne <", value, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneLessThanOrEqualTo(BigDecimal value) {
addCriterion("PresetPriceOne <=", value, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneIn(List<BigDecimal> values) {
addCriterion("PresetPriceOne in", values, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneNotIn(List<BigDecimal> values) {
addCriterion("PresetPriceOne not in", values, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("PresetPriceOne between", value1, value2, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpriceoneNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("PresetPriceOne not between", value1, value2, "presetpriceone");
return (Criteria) this;
}
public Criteria andPresetpricetwoIsNull() {
addCriterion("PresetPriceTwo is null");
return (Criteria) this;
}
public Criteria andPresetpricetwoIsNotNull() {
addCriterion("PresetPriceTwo is not null");
return (Criteria) this;
}
public Criteria andPresetpricetwoEqualTo(BigDecimal value) {
addCriterion("PresetPriceTwo =", value, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoNotEqualTo(BigDecimal value) {
addCriterion("PresetPriceTwo <>", value, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoGreaterThan(BigDecimal value) {
addCriterion("PresetPriceTwo >", value, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("PresetPriceTwo >=", value, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoLessThan(BigDecimal value) {
addCriterion("PresetPriceTwo <", value, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoLessThanOrEqualTo(BigDecimal value) {
addCriterion("PresetPriceTwo <=", value, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoIn(List<BigDecimal> values) {
addCriterion("PresetPriceTwo in", values, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoNotIn(List<BigDecimal> values) {
addCriterion("PresetPriceTwo not in", values, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("PresetPriceTwo between", value1, value2, "presetpricetwo");
return (Criteria) this;
}
public Criteria andPresetpricetwoNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("PresetPriceTwo not between", value1, value2, "presetpricetwo");
return (Criteria) this;
}
public Criteria andUnitidIsNull() {
addCriterion("UnitId is null");
return (Criteria) this;
@@ -1225,216 +835,6 @@ public class MaterialExample {
return (Criteria) this;
}
public Criteria andFirstoutunitIsNull() {
addCriterion("FirstOutUnit is null");
return (Criteria) this;
}
public Criteria andFirstoutunitIsNotNull() {
addCriterion("FirstOutUnit is not null");
return (Criteria) this;
}
public Criteria andFirstoutunitEqualTo(String value) {
addCriterion("FirstOutUnit =", value, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitNotEqualTo(String value) {
addCriterion("FirstOutUnit <>", value, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitGreaterThan(String value) {
addCriterion("FirstOutUnit >", value, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitGreaterThanOrEqualTo(String value) {
addCriterion("FirstOutUnit >=", value, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitLessThan(String value) {
addCriterion("FirstOutUnit <", value, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitLessThanOrEqualTo(String value) {
addCriterion("FirstOutUnit <=", value, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitLike(String value) {
addCriterion("FirstOutUnit like", value, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitNotLike(String value) {
addCriterion("FirstOutUnit not like", value, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitIn(List<String> values) {
addCriterion("FirstOutUnit in", values, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitNotIn(List<String> values) {
addCriterion("FirstOutUnit not in", values, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitBetween(String value1, String value2) {
addCriterion("FirstOutUnit between", value1, value2, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstoutunitNotBetween(String value1, String value2) {
addCriterion("FirstOutUnit not between", value1, value2, "firstoutunit");
return (Criteria) this;
}
public Criteria andFirstinunitIsNull() {
addCriterion("FirstInUnit is null");
return (Criteria) this;
}
public Criteria andFirstinunitIsNotNull() {
addCriterion("FirstInUnit is not null");
return (Criteria) this;
}
public Criteria andFirstinunitEqualTo(String value) {
addCriterion("FirstInUnit =", value, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitNotEqualTo(String value) {
addCriterion("FirstInUnit <>", value, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitGreaterThan(String value) {
addCriterion("FirstInUnit >", value, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitGreaterThanOrEqualTo(String value) {
addCriterion("FirstInUnit >=", value, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitLessThan(String value) {
addCriterion("FirstInUnit <", value, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitLessThanOrEqualTo(String value) {
addCriterion("FirstInUnit <=", value, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitLike(String value) {
addCriterion("FirstInUnit like", value, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitNotLike(String value) {
addCriterion("FirstInUnit not like", value, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitIn(List<String> values) {
addCriterion("FirstInUnit in", values, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitNotIn(List<String> values) {
addCriterion("FirstInUnit not in", values, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitBetween(String value1, String value2) {
addCriterion("FirstInUnit between", value1, value2, "firstinunit");
return (Criteria) this;
}
public Criteria andFirstinunitNotBetween(String value1, String value2) {
addCriterion("FirstInUnit not between", value1, value2, "firstinunit");
return (Criteria) this;
}
public Criteria andPricestrategyIsNull() {
addCriterion("PriceStrategy is null");
return (Criteria) this;
}
public Criteria andPricestrategyIsNotNull() {
addCriterion("PriceStrategy is not null");
return (Criteria) this;
}
public Criteria andPricestrategyEqualTo(String value) {
addCriterion("PriceStrategy =", value, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyNotEqualTo(String value) {
addCriterion("PriceStrategy <>", value, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyGreaterThan(String value) {
addCriterion("PriceStrategy >", value, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyGreaterThanOrEqualTo(String value) {
addCriterion("PriceStrategy >=", value, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyLessThan(String value) {
addCriterion("PriceStrategy <", value, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyLessThanOrEqualTo(String value) {
addCriterion("PriceStrategy <=", value, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyLike(String value) {
addCriterion("PriceStrategy like", value, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyNotLike(String value) {
addCriterion("PriceStrategy not like", value, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyIn(List<String> values) {
addCriterion("PriceStrategy in", values, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyNotIn(List<String> values) {
addCriterion("PriceStrategy not in", values, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyBetween(String value1, String value2) {
addCriterion("PriceStrategy between", value1, value2, "pricestrategy");
return (Criteria) this;
}
public Criteria andPricestrategyNotBetween(String value1, String value2) {
addCriterion("PriceStrategy not between", value1, value2, "pricestrategy");
return (Criteria) this;
}
public Criteria andEnabledIsNull() {
addCriterion("Enabled is null");
return (Criteria) this;
@@ -1906,25 +1306,12 @@ public class MaterialExample {
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_material
*
* @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_material
*
* @mbggenerated
*/
public static class Criterion {
private String condition;

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

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

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

@@ -47,10 +47,6 @@ public interface MaterialMapperEx {
int findBySelectWithBarCodeCount(@Param("q") String q);
int updatePriceNullByPrimaryKey(Long id);
int updateUnitIdNullByPrimaryKey(Long id);
List<MaterialVo4Unit> findByAll(
@Param("name") String name,
@Param("model") String model,

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

@@ -186,12 +186,6 @@ public class MaterialService {
material.setId(id);
try{
materialMapper.updateByPrimaryKeySelective(material);
Long unitId = material.getUnitid();
if(unitId != null) {
materialMapperEx.updatePriceNullByPrimaryKey(id); //将价格置空
} else {
materialMapperEx.updateUnitIdNullByPrimaryKey(id); //将多单位置空
}
JSONObject mObj = JSON.parseObject(beanJson);
materialExtendService.saveDetials(mObj.getString("inserted"),mObj.getString("deleted"),mObj.getString("updated"),mObj.getString("sortList"),id);
if(mObj.get("stock")!=null) {
@@ -435,8 +429,8 @@ public class MaterialService {
String manyUnitAll = unit + "," + manyUnit + "(1:" + ratio + ")";
Long unitId = unitService.getUnitIdByName(manyUnitAll);
m.setUnitid(unitId);
m.setFirstoutunit(unit); //首选出库单位
m.setFirstinunit(manyUnit); //首选入库单位
//m.setFirstoutunit(unit); //首选出库单位
//m.setFirstinunit(manyUnit); //首选入库单位
JSONArray arr = new JSONArray();
JSONObject basicObj = new JSONObject();
basicObj.put("Unit", unit);
@@ -456,13 +450,13 @@ public class MaterialService {
otherObjEx.put("other", otherObj);
arr.add(basicObjEx);
arr.add(otherObjEx);
m.setPricestrategy(arr.toJSONString());
//m.setPricestrategy(arr.toJSONString());
} else {
m.setUnit(unit);
m.setRetailprice(parseBigDecimalEx(retailPrice));
m.setLowprice(parseBigDecimalEx(lowPrice));
m.setPresetpriceone(parseBigDecimalEx(presetpriceone));
m.setPresetpricetwo(parseBigDecimalEx(presetpricetwo));
//m.setRetailprice(parseBigDecimalEx(retailPrice));
//m.setLowprice(parseBigDecimalEx(lowPrice));
//m.setPresetpriceone(parseBigDecimalEx(presetpriceone));
//m.setPresetpricetwo(parseBigDecimalEx(presetpricetwo));
}
String enabled = ExcelUtils.getContent(src, i, 12); //状态
m.setEnabled(enabled.equals("1")? true: false);