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

更新后端代码

Browse Source
This commit is contained in:
季圣华
2017-08-30 00:14:38 +08:00
parent b9bc613c60
commit 5e05f53af2
49 changed files with 4413 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/jsh/model/po/Depot.java
View File

@@ -5,23 +5,29 @@ public class Depot implements java.io.Serializable
{
private Long id;
private String name;
private String address;
private Double warehousing;
private Double truckage;
private Integer type;
private String sort;
private String remark;
public Depot()
{
}
public Depot(Long id)
{
this.id = id ;
}
public Depot(String name,Integer type, String sort, String remark)
public Depot(String name, String address, Double warehousing, Double truckage, Integer type, String sort, String remark)
{
this.name = name;
this.address = address;
this.warehousing = warehousing;
this.truckage = truckage;
this.type = type;
this.sort = sort;
this.remark = remark;
@@ -43,6 +49,30 @@ public class Depot implements java.io.Serializable
this.name = name;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public Double getWarehousing() {
return warehousing;
}
public void setWarehousing(Double warehousing) {
this.warehousing = warehousing;
}
public Double getTruckage() {
return truckage;
}
public void setTruckage(Double truckage) {
this.truckage = truckage;
}
public Integer getType() {
return type;
}

127
src/main/java/com/jsh/model/po/DepotHead.java
View File

@@ -9,17 +9,29 @@ public class DepotHead implements java.io.Serializable
private String Type;
private String SubType;
private Depot ProjectId;
private String DefaultNumber;
private String Number;
private String OperPersonName;
private Timestamp CreateTime;
private Timestamp OperTime;
private Supplier OrganId;
private Person HandsPersonId;
private String Salesman; //业务员（可以多个）[2][3]
private Account AccountId;
private Double ChangeAmount;
private String AccountIdList; //多账户ID列表 [2][3]
private String AccountMoneyList; //多账户金额列表 [{"[2]",22},{"[3]",33}]
private Double Discount; //优惠率 0.10
private Double DiscountMoney; //优惠金额 10
private Double DiscountLastMoney; //优惠后金额 90
private Double OtherMoney; //销售或采购费用 100
private String OtherMoneyList; //销售或采购费用涉及项目Id数组（包括快递、招待等）[2][3]
private String OtherMoneyItem; //销售费用涉及项目（包括快递、招待等） [{"[2]",22},{"[3]",33}]
private Integer AccountDay; //结算天数
private Depot AllocationProjectId;
private Double TotalPrice;
private String PayType;
private Boolean Status = false; //单据状态
private String Remark;
public DepotHead()
@@ -32,25 +44,36 @@ public class DepotHead implements java.io.Serializable
this.Id = Id ;
}
public DepotHead(String type, String subType, Depot projectId,
String number, String operPersonName, Timestamp createTime,
Timestamp operTime, Supplier organId, Person handsPersonId,
Account accountId, Double changeAmount, Depot allocationProjectId, Double totalPrice,String payType, String remark) {
public DepotHead(String type, String subType, Depot projectId, String defaultNumber, String number, String operPersonName, Timestamp createTime,
Timestamp operTime, Supplier organId, Person handsPersonId, String salesman, String accountIdList,String accountMoneyList,
Double discount, Double discountMoney,Double discountLastMoney, Double otherMoney, String otherMoneyItem,Integer accountDay,
Account accountId, Double changeAmount, Depot allocationProjectId, Double totalPrice,String payType, Boolean status, String remark) {
super();
Type = type;
SubType = subType;
ProjectId = projectId;
DefaultNumber = defaultNumber;
Number = number;
OperPersonName = operPersonName;
CreateTime = createTime;
OperTime = operTime;
OrganId = organId;
HandsPersonId = handsPersonId;
Salesman= salesman;
AccountIdList= accountIdList;
AccountMoneyList= accountMoneyList;
Discount= discount;
DiscountMoney = discountMoney;
DiscountLastMoney = discountLastMoney;
OtherMoney = otherMoney;
OtherMoneyItem = otherMoneyItem;
AccountDay = accountDay;
AccountId = accountId;
ChangeAmount = changeAmount;
AllocationProjectId = allocationProjectId;
TotalPrice = totalPrice;
PayType = payType;
Status = status;
Remark = remark;
}
@@ -86,6 +109,14 @@ public class DepotHead implements java.io.Serializable
ProjectId = projectId;
}
public String getDefaultNumber() {
return DefaultNumber;
}
public void setDefaultNumber(String defaultNumber) {
DefaultNumber = defaultNumber;
}
public String getNumber() {
return Number;
}
@@ -181,4 +212,92 @@ public class DepotHead implements java.io.Serializable
public void setRemark(String remark) {
Remark = remark;
}
public String getSalesman() {
return Salesman;
}
public void setSalesman(String salesman) {
Salesman = salesman;
}
public String getAccountIdList() {
return AccountIdList;
}
public void setAccountIdList(String accountIdList) {
AccountIdList = accountIdList;
}
public String getAccountMoneyList() {
return AccountMoneyList;
}
public void setAccountMoneyList(String accountMoneyList) {
AccountMoneyList = accountMoneyList;
}
public Double getDiscount() {
return Discount;
}
public void setDiscount(Double discount) {
Discount = discount;
}
public Double getDiscountMoney() {
return DiscountMoney;
}
public void setDiscountMoney(Double discountMoney) {
DiscountMoney = discountMoney;
}
public Double getDiscountLastMoney() {
return DiscountLastMoney;
}
public void setDiscountLastMoney(Double discountLastMoney) {
DiscountLastMoney = discountLastMoney;
}
public Double getOtherMoney() {
return OtherMoney;
}
public void setOtherMoney(Double otherMoney) {
OtherMoney = otherMoney;
}
public String getOtherMoneyList() {
return OtherMoneyList;
}
public void setOtherMoneyList(String otherMoneyList) {
OtherMoneyList = otherMoneyList;
}
public String getOtherMoneyItem() {
return OtherMoneyItem;
}
public void setOtherMoneyItem(String otherMoneyItem) {
OtherMoneyItem = otherMoneyItem;
}
public Integer getAccountDay() {
return AccountDay;
}
public void setAccountDay(Integer accountDay) {
AccountDay = accountDay;
}
public Boolean getStatus() {
return Status;
}
public void setStatus(Boolean status) {
Status = status;
}
}

136
src/main/java/com/jsh/model/po/DepotItem.java
View File

@@ -6,11 +6,25 @@ public class DepotItem implements java.io.Serializable
private Long Id;
private DepotHead HeaderId;
private Material MaterialId;
private String MUnit; //计量单位
private Double OperNumber;
private Double BasicNumber;
private Double UnitPrice;
private Double TaxUnitPrice; //含税单价
private Double AllPrice;
private String Remark;
private String Img;
private Depot DepotId; //仓库ID
private Depot AnotherDepotId; //对方仓库Id
private Double TaxRate; //税率
private Double TaxMoney; //税额
private Double TaxLastMoney; //价税合计
private String OtherField1; //自定义字段1-品名
private String OtherField2; //自定义字段2-型号
private String OtherField3; //自定义字段3-制造商
private String OtherField4; //自定义字段4
private String OtherField5; //自定义字段5
public DepotItem()
{
@@ -22,17 +36,31 @@ public class DepotItem implements java.io.Serializable
this.Id = Id ;
}
public DepotItem(DepotHead headerId, Material materialId,
Double operNumber, Double unitPrice, Double allPrice,
String remark, String img) {
public DepotItem(DepotHead headerId, Material materialId, String mUnit,
Double operNumber, Double basicNumber, Double unitPrice, Double taxUnitPrice, Double allPrice, String remark, String img,
Depot depotId, Depot anotherDepotId, Double taxRate, Double taxMoney, Double taxLastMoney,
String otherField1, String otherField2, String otherField3, String otherField4, String otherField5) {
super();
HeaderId = headerId;
MaterialId = materialId;
MUnit = mUnit;
OperNumber = operNumber;
BasicNumber = basicNumber;
UnitPrice = unitPrice;
TaxUnitPrice = taxUnitPrice;
AllPrice = allPrice;
Remark = remark;
Img = img;
DepotId = depotId;
AnotherDepotId = anotherDepotId;
TaxRate = taxRate;
TaxMoney = taxMoney;
TaxLastMoney = taxLastMoney;
OtherField1 = otherField1;
OtherField2 = otherField2;
OtherField3 = otherField3;
OtherField4 = otherField4;
OtherField5 = otherField5;
}
public Long getId() {
@@ -59,6 +87,22 @@ public class DepotItem implements java.io.Serializable
MaterialId = materialId;
}
public String getMUnit() {
return MUnit;
}
public void setMUnit(String MUnit) {
this.MUnit = MUnit;
}
public Double getTaxUnitPrice() {
return TaxUnitPrice;
}
public void setTaxUnitPrice(Double taxUnitPrice) {
TaxUnitPrice = taxUnitPrice;
}
public Double getOperNumber() {
return OperNumber;
}
@@ -67,6 +111,14 @@ public class DepotItem implements java.io.Serializable
OperNumber = operNumber;
}
public Double getBasicNumber() {
return BasicNumber;
}
public void setBasicNumber(Double basicNumber) {
BasicNumber = basicNumber;
}
public Double getUnitPrice() {
return UnitPrice;
}
@@ -99,5 +151,83 @@ public class DepotItem implements java.io.Serializable
Img = img;
}
public Depot getDepotId() {
return DepotId;
}
public void setDepotId(Depot depotId) {
DepotId = depotId;
}
public Depot getAnotherDepotId() {
return AnotherDepotId;
}
public void setAnotherDepotId(Depot anotherDepotId) {
AnotherDepotId = anotherDepotId;
}
public Double getTaxRate() {
return TaxRate;
}
public void setTaxRate(Double taxRate) {
TaxRate = taxRate;
}
public Double getTaxMoney() {
return TaxMoney;
}
public void setTaxMoney(Double taxMoney) {
TaxMoney = taxMoney;
}
public Double getTaxLastMoney() {
return TaxLastMoney;
}
public void setTaxLastMoney(Double taxLastMoney) {
TaxLastMoney = taxLastMoney;
}
public String getOtherField1() {
return OtherField1;
}
public void setOtherField1(String otherField1) {
OtherField1 = otherField1;
}
public String getOtherField2() {
return OtherField2;
}
public void setOtherField2(String otherField2) {
OtherField2 = otherField2;
}
public String getOtherField3() {
return OtherField3;
}
public void setOtherField3(String otherField3) {
OtherField3 = otherField3;
}
public String getOtherField4() {
return OtherField4;
}
public void setOtherField4(String otherField4) {
OtherField4 = otherField4;
}
public String getOtherField5() {
return OtherField5;
}
public void setOtherField5(String otherField5) {
OtherField5 = otherField5;
}
}

10
src/main/java/com/jsh/model/po/Functions.java
View File

@@ -11,7 +11,8 @@ public class Functions implements java.io.Serializable
private Boolean State;
private String Sort;
private Boolean Enabled;
private String Type;
private String Type;
private String PushBtn;
public Functions()
{
@@ -90,4 +91,11 @@ public class Functions implements java.io.Serializable
Type = type;
}
public String getPushBtn() {
return PushBtn;
}
public void setPushBtn(String pushBtn) {
PushBtn = pushBtn;
}
}

136
src/main/java/com/jsh/model/po/Material.java
View File

@@ -1,11 +1,16 @@
package com.jsh.model.po;
import java.util.Map;
@SuppressWarnings("serial")
public class Material implements java.io.Serializable
{
private Long Id;
private MaterialCategory materialCategory;
private String Name;
private String Mfrs;
private Double Packing;
private Double SafetyStock;
private String Model;
private String Standard;
private String Color;
@@ -14,7 +19,25 @@ public class Material implements java.io.Serializable
private Double LowPrice;
private Double PresetPriceOne;
private Double PresetPriceTwo;
private Unit UnitId;
private String FirstOutUnit;
private String FirstInUnit;
private String PriceStrategy;
private String Remark;
private Boolean Enabled;
//----------以下属性导入exel表格使用--------------------
/**
* 类型 right--正确 warn--警告 wrong--错误
*/
private Map<Integer,String> cellInfo;
/**
* 行号
*/
private Integer rowLineNum;
private String safetyStockStr;
public Material()
{
@@ -26,13 +49,16 @@ public class Material implements java.io.Serializable
this.Id = Id;
}
public Material(MaterialCategory materialCategory, String name,
String model, String standard, String color, String unit, String remark,
Double retailPrice, Double lowPrice, Double presetPriceOne, Double presetPriceTwo)
{
public Material(MaterialCategory materialCategory, String name, String mfrs, Double packing,
Double safetyStock, String model, String standard, String color, String unit, String remark,
Double retailPrice, Double lowPrice, Double presetPriceOne, Double presetPriceTwo,
Unit unitId, String firstOutUnit, String firstInUnit, String priceStrategy, Boolean enabled) {
super();
this.materialCategory = materialCategory;
Name = name;
Mfrs = mfrs;
Packing = packing;
SafetyStock = safetyStock;
Model = model;
Standard = standard;
Color = color;
@@ -42,6 +68,11 @@ public class Material implements java.io.Serializable
PresetPriceOne = presetPriceOne;
PresetPriceTwo = presetPriceTwo;
Remark = remark;
UnitId = unitId;
FirstOutUnit = firstOutUnit;
FirstInUnit = firstInUnit;
PriceStrategy = priceStrategy;
Enabled = enabled;
}
public Long getId()
@@ -102,17 +133,15 @@ public class Material implements java.io.Serializable
Color = color;
}
public String getUnit()
{
public String getUnit() {
return Unit;
}
public void setUnit(String unit)
{
public void setUnit(String unit) {
Unit = unit;
}
public void setRetailPrice(Double retailPrice)
public void setRetailPrice(Double retailPrice)
{
RetailPrice = retailPrice;
}
@@ -162,4 +191,91 @@ public class Material implements java.io.Serializable
Remark = remark;
}
public String getMfrs() {
return Mfrs;
}
public void setMfrs(String mfrs) {
Mfrs = mfrs;
}
public Double getPacking() {
return Packing;
}
public void setPacking(Double packing) {
Packing = packing;
}
public Double getSafetyStock() {
return SafetyStock;
}
public void setSafetyStock(Double safetyStock) {
SafetyStock = safetyStock;
}
public Unit getUnitId() {
return UnitId;
}
public void setUnitId(Unit unitId) {
UnitId = unitId;
}
public String getFirstOutUnit() {
return FirstOutUnit;
}
public void setFirstOutUnit(String firstOutUnit) {
FirstOutUnit = firstOutUnit;
}
public String getFirstInUnit() {
return FirstInUnit;
}
public void setFirstInUnit(String firstInUnit) {
FirstInUnit = firstInUnit;
}
public String getPriceStrategy() {
return PriceStrategy;
}
public void setPriceStrategy(String priceStrategy) {
PriceStrategy = priceStrategy;
}
public Boolean getEnabled() {
return Enabled;
}
public void setEnabled(Boolean enabled) {
Enabled = enabled;
}
public Map<Integer, String> getCellInfo() {
return cellInfo;
}
public void setCellInfo(Map<Integer, String> cellInfo) {
this.cellInfo = cellInfo;
}
public Integer getRowLineNum() {
return rowLineNum;
}
public void setRowLineNum(Integer rowLineNum) {
this.rowLineNum = rowLineNum;
}
public String getSafetyStockStr() {
return safetyStockStr;
}
public void setSafetyStockStr(String safetyStockStr) {
this.safetyStockStr = safetyStockStr;
}
}

2
src/main/java/com/jsh/model/po/MaterialCategory.java
View File

@@ -57,5 +57,5 @@ public class MaterialCategory implements java.io.Serializable
public void setMaterialCategory(MaterialCategory materialCategory) {
this.materialCategory = materialCategory;
}
}

185
src/main/java/com/jsh/model/po/Supplier.java
View File

@@ -1,22 +1,53 @@
package com.jsh.model.po;
import java.util.Map;
@SuppressWarnings("serial")
public class Supplier implements java.io.Serializable
{
private Long id;
private String supplier;
private String type;
private String contacts;
private String phonenum;
private String email;
private Double advanceIn;
private Double BeginNeedGet;
private Double BeginNeedPay;
private Double AllNeedGet;
private Double AllNeedPay;
private Short isystem;
private String description;
private Boolean enabled;
private Long id =0l;
private String supplier = "";
private String type = "";
private String contacts = "";
private String phonenum = "";
private String fax = "";
private String telephone = "";
private String email = "";
private String address = "";
private Double advanceIn = 0d;
private String taxNum = "";
private String bankName = "";
private String accountNumber = "";
private Double taxRate = 0d;
private Double BeginNeedGet = 0d;
private Double BeginNeedPay = 0d;
private Double AllNeedGet = 0d;
private Double AllNeedPay = 0d;
private Short isystem = 1;
private String description = "";
private Boolean enabled = true;
//----------以下属性导入exel表格使用--------------------
/**
* 类型 right--正确 warn--警告 wrong--错误
*/
private Map<Integer,String> cellInfo;
/**
* 行号
*/
private Integer rowLineNum;
private String advanceInStr;
private String beginNeedGetStr;
private String beginNeedPayStr;
private String taxRateStr;
private String enabledStr;
public Supplier()
{
@@ -28,14 +59,18 @@ public class Supplier implements java.io.Serializable
this.id = id;
}
public Supplier(String supplier, String type, String contacts, String phonenum,
String email, Short isystem, String description, Boolean enabled, Double advanceIn,
Double beginNeedGet,Double beginNeedPay,Double allNeedGet,Double allNeedPay) {
public Supplier(String supplier, String type, String contacts, String phonenum,
String fax,String telephone, String email, String address, Short isystem, String description,
Boolean enabled, Double advanceIn, String taxNum,String bankName,String accountNumber, Double taxRate,
Double beginNeedGet,Double beginNeedPay,Double allNeedGet,Double allNeedPay) {
super();
this.supplier = supplier;
this.type = type;
this.contacts = contacts;
this.phonenum = phonenum;
this.fax = fax;
this.telephone = telephone;
this.address = address;
this.email = email;
this.BeginNeedGet = beginNeedGet;
this.BeginNeedPay = beginNeedPay;
@@ -45,6 +80,10 @@ public class Supplier implements java.io.Serializable
this.description = description;
this.enabled = enabled;
this.advanceIn = advanceIn;
this.taxNum = taxNum;
this.bankName = bankName;
this.accountNumber = accountNumber;
this.taxRate = taxRate;
}
public Long getId()
@@ -169,4 +208,116 @@ public class Supplier implements java.io.Serializable
public void setAdvanceIn(Double advanceIn) {
this.advanceIn = advanceIn;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
this.fax = fax;
}
public String getTelephone() {
return telephone;
}
public void setTelephone(String telephone) {
this.telephone = telephone;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getTaxNum() {
return taxNum;
}
public void setTaxNum(String taxNum) {
this.taxNum = taxNum;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getAccountNumber() {
return accountNumber;
}
public void setAccountNumber(String accountNumber) {
this.accountNumber = accountNumber;
}
public Double getTaxRate() {
return taxRate;
}
public void setTaxRate(Double taxRate) {
this.taxRate = taxRate;
}
public Map<Integer, String> getCellInfo() {
return cellInfo;
}
public void setCellInfo(Map<Integer, String> cellInfo) {
this.cellInfo = cellInfo;
}
public Integer getRowLineNum() {
return rowLineNum;
}
public void setRowLineNum(Integer rowLineNum) {
this.rowLineNum = rowLineNum;
}
public String getAdvanceInStr() {
return advanceInStr;
}
public void setAdvanceInStr(String advanceInStr) {
this.advanceInStr = advanceInStr;
}
public String getBeginNeedGetStr() {
return beginNeedGetStr;
}
public void setBeginNeedGetStr(String beginNeedGetStr) {
this.beginNeedGetStr = beginNeedGetStr;
}
public String getBeginNeedPayStr() {
return beginNeedPayStr;
}
public void setBeginNeedPayStr(String beginNeedPayStr) {
this.beginNeedPayStr = beginNeedPayStr;
}
public String getTaxRateStr() {
return taxRateStr;
}
public void setTaxRateStr(String taxRateStr) {
this.taxRateStr = taxRateStr;
}
public String getEnabledStr() {
return enabledStr;
}
public void setEnabledStr(String enabledStr) {
this.enabledStr = enabledStr;
}
}

39
src/main/java/com/jsh/model/po/Unit.java Normal file
View File

@@ -0,0 +1,39 @@
package com.jsh.model.po;
@SuppressWarnings("serial")
public class Unit implements java.io.Serializable
{
private Long id;
private String UName;
public Unit()
{
}
public Unit(Long id) {
this.id = id;
}
public Unit(String UName)
{
this.UName = UName;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getUName() {
return UName;
}
public void setUName(String UName) {
this.UName = UName;
}
}

9
src/main/java/com/jsh/model/po/UserBusiness.java
View File

@@ -7,6 +7,7 @@ public class UserBusiness implements java.io.Serializable
private String Type;
private String KeyId;
private String Value;
private String BtnStr;
public UserBusiness()
{
@@ -44,6 +45,12 @@ public class UserBusiness implements java.io.Serializable
public void setValue(String value) {
Value = value;
}
public String getBtnStr() {
return BtnStr;
}
public void setBtnStr(String btnStr) {
BtnStr = btnStr;
}
}

128
src/main/java/com/jsh/model/vo/basic/DepotModel.java
View File

@@ -5,63 +5,67 @@ import java.io.Serializable;
@SuppressWarnings("serial")
public class DepotModel implements Serializable
{
private DepotShowModel showModel = new DepotShowModel();
private DepotShowModel showModel = new DepotShowModel();
/**======开始接受页面参数=================**/
/**
* 仓库名称
*/
private String name = "";
/**======开始接受页面参数=================**/
/**
* 仓库名称
*/
private String name = "";
/**
* 排序
*/
private String sort = "";
private String address = ""; //仓库地址
private Double warehousing; //仓储费
private Double truckage; //搬运费
/**
* 排序
*/
private String sort = "";
/**
* 类型
*/
private Integer type = 0;
/**
* 描述
*/
private String remark = "";
/**
* 分类ID
*/
private Long depotID = 0l;
/**
* 分类IDs 批量操作使用
*/
private String depotIDs = "";
/**
* 每页显示的个数
*/
private int pageSize = 10;
/**
* 当前页码
*/
private int pageNo = 1;
/**
* 用户IP，用户记录操作日志
*/
private String clientIp = "";
/**
* UBType，UserBusiness类型
*/
private String UBType = "";
/**
* UBKeyId，UserBusiness关键id
*/
private String UBKeyId = "";
/**
* 描述
*/
private String remark = "";
/**
* 分类ID
*/
private Long depotID = 0l;
/**
* 分类IDs 批量操作使用
*/
private String depotIDs = "";
/**
* 每页显示的个数
*/
private int pageSize = 10;
/**
* 当前页码
*/
private int pageNo = 1;
/**
* 用户IP，用户记录操作日志
*/
private String clientIp = "";
/**
* UBType，UserBusiness类型
*/
private String UBType = "";
/**
* UBKeyId，UserBusiness关键id
*/
private String UBKeyId = "";
public DepotShowModel getShowModel() {
return showModel;
@@ -79,6 +83,30 @@ public class DepotModel implements Serializable
this.name = name;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public Double getWarehousing() {
return warehousing;
}
public void setWarehousing(Double warehousing) {
this.warehousing = warehousing;
}
public Double getTruckage() {
return truckage;
}
public void setTruckage(Double truckage) {
this.truckage = truckage;
}
public Integer getType() {
return type;
}

14
src/main/java/com/jsh/model/vo/basic/FunctionsModel.java
View File

@@ -39,7 +39,11 @@ public class FunctionsModel implements Serializable
/**
* 类型
*/
private String Type = "";
private String Type = "";
/**
* 功能按钮
*/
private String PushBtn = "";
/**
* 拥有的功能列表
*/
@@ -215,5 +219,11 @@ public class FunctionsModel implements Serializable
this.hasFunctions = hasFunctions;
}
public String getPushBtn() {
return PushBtn;
}
public void setPushBtn(String pushBtn) {
PushBtn = pushBtn;
}
}

125
src/main/java/com/jsh/model/vo/basic/SupplierModel.java
View File

@@ -1,5 +1,7 @@
package com.jsh.model.vo.basic;
import java.io.File;
import java.io.InputStream;
import java.io.Serializable;
@SuppressWarnings("serial")
@@ -9,7 +11,7 @@ public class SupplierModel implements Serializable
/**======开始接受页面参数=================**/
/**
* 供应商名称
* 名称
*/
private String supplier = "";
@@ -62,6 +64,23 @@ public class SupplierModel implements Serializable
* 描述信息
*/
private String description = "";
private String fax = "";
private String telephone = "";
private String address = "";
private String taxNum = "";
private String bankName = "";
private String accountNumber = "";
private Double taxRate;
private String UBType = ""; //UBType，UserBusiness类型
private String UBKeyId = ""; //UBKeyId，UserBusiness关键id
/**
* 导入excel文件
*/
private File supplierFile;
/**
* 启用
@@ -92,6 +111,9 @@ public class SupplierModel implements Serializable
* 用户IP，用户记录操作日志
*/
private String clientIp = "";
private String browserType = ""; //浏览器类型
private String fileName = ""; //文件名称
private InputStream excelStream; //输入流，导出excel文件
public SupplierShowModel getShowModel() {
return showModel;
@@ -245,6 +267,107 @@ public class SupplierModel implements Serializable
this.clientIp = clientIp;
}
public String getFax() {
return fax;
}
public void setFax(String fax) {
this.fax = fax;
}
public String getTelephone() {
return telephone;
}
public void setTelephone(String telephone) {
this.telephone = telephone;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getTaxNum() {
return taxNum;
}
public void setTaxNum(String taxNum) {
this.taxNum = taxNum;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getAccountNumber() {
return accountNumber;
}
public void setAccountNumber(String accountNumber) {
this.accountNumber = accountNumber;
}
public Double getTaxRate() {
return taxRate;
}
public void setTaxRate(Double taxRate) {
this.taxRate = taxRate;
}
public String getUBType() {
return UBType;
}
public void setUBType(String UBType) {
this.UBType = UBType;
}
public String getUBKeyId() {
return UBKeyId;
}
public void setUBKeyId(String UBKeyId) {
this.UBKeyId = UBKeyId;
}
public String getBrowserType() {
return browserType;
}
public void setBrowserType(String browserType) {
this.browserType = browserType;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public InputStream getExcelStream() {
return excelStream;
}
public void setExcelStream(InputStream excelStream) {
this.excelStream = excelStream;
}
public File getSupplierFile() {
return supplierFile;
}
public void setSupplierFile(File supplierFile) {
this.supplierFile = supplierFile;
}
}

98
src/main/java/com/jsh/model/vo/basic/UnitModel.java Normal file
View File

@@ -0,0 +1,98 @@
package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class UnitModel implements Serializable
{
private DepotShowModel showModel = new DepotShowModel();
/**======开始接受页面参数=================**/
/**
* 名称
*/
private String UName = "";
/**
* ID
*/
private Long unitID = 0l;
/**
* IDs 批量操作使用
*/
private String unitIDs = "";
/**
* 每页显示的个数
*/
private int pageSize = 10;
/**
* 当前页码
*/
private int pageNo = 1;
/**
* 用户IP，用户记录操作日志
*/
private String clientIp = "";
public DepotShowModel getShowModel() {
return showModel;
}
public void setShowModel(DepotShowModel showModel) {
this.showModel = showModel;
}
public String getUName() {
return UName;
}
public void setUName(String UName) {
this.UName = UName;
}
public Long getUnitID() {
return unitID;
}
public void setUnitID(Long unitID) {
this.unitID = unitID;
}
public String getUnitIDs() {
return unitIDs;
}
public void setUnitIDs(String unitIDs) {
this.unitIDs = unitIDs;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public String getClientIp() {
return clientIp;
}
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
}

43
src/main/java/com/jsh/model/vo/basic/UnitShowModel.java Normal file
View File

@@ -0,0 +1,43 @@
package com.jsh.model.vo.basic;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@SuppressWarnings("serial")
public class UnitShowModel implements Serializable
{
/**
* 提示信息
*/
private String msgTip = "";
/**
* 系统数据
*/
@SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>();
public String getMsgTip()
{
return msgTip;
}
public void setMsgTip(String msgTip)
{
this.msgTip = msgTip;
}
@SuppressWarnings("rawtypes")
public Map<String, List> getMap() {
return map;
}
@SuppressWarnings("rawtypes")
public void setMap(Map<String, List> map) {
this.map = map;
}
}

9
src/main/java/com/jsh/model/vo/basic/UserBusinessModel.java
View File

@@ -22,6 +22,8 @@ public class UserBusinessModel implements Serializable
* 值
*/
private String Value = "";
private String BtnStr = "";
/**
* 分类ID
@@ -120,4 +122,11 @@ public class UserBusinessModel implements Serializable
this.clientIp = clientIp;
}
public String getBtnStr() {
return BtnStr;
}
public void setBtnStr(String btnStr) {
BtnStr = btnStr;
}
}

113
src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java
View File

@@ -12,6 +12,7 @@ public class DepotHeadModel implements Serializable
private String SubType = "";
private Long ProjectId;
private String DepotIds = "";
private String DefaultNumber = "";
private String Number = "";
private String OperPersonName = "";
private String OperTime;
@@ -22,7 +23,19 @@ public class DepotHeadModel implements Serializable
private Long AllocationProjectId;
private Double TotalPrice;
private String PayType = "";
private String Remark = "";
private String Remark = "";
private String Salesman;
private String AccountIdList;
private String AccountMoneyList;
private Double Discount;
private Double DiscountMoney;
private Double DiscountLastMoney;
private Double OtherMoney;
private String OtherMoneyList;
private String OtherMoneyItem;
private Integer AccountDay;
private Boolean Status = false; //单据状态
private String BeginTime; //查询开始时间
private String EndTime; //查询结束时间
@@ -95,6 +108,14 @@ public class DepotHeadModel implements Serializable
DepotIds = depotIds;
}
public String getDefaultNumber() {
return DefaultNumber;
}
public void setDefaultNumber(String defaultNumber) {
DefaultNumber = defaultNumber;
}
public String getNumber() {
return Number;
}
@@ -254,6 +275,92 @@ public class DepotHeadModel implements Serializable
public void setSupplierId(String supplierId) {
this.supplierId = supplierId;
}
public String getSalesman() {
return Salesman;
}
public void setSalesman(String salesman) {
Salesman = salesman;
}
public String getAccountIdList() {
return AccountIdList;
}
public void setAccountIdList(String accountIdList) {
AccountIdList = accountIdList;
}
public String getAccountMoneyList() {
return AccountMoneyList;
}
public void setAccountMoneyList(String accountMoneyList) {
AccountMoneyList = accountMoneyList;
}
public Double getDiscount() {
return Discount;
}
public void setDiscount(Double discount) {
Discount = discount;
}
public Double getDiscountMoney() {
return DiscountMoney;
}
public void setDiscountMoney(Double discountMoney) {
DiscountMoney = discountMoney;
}
public Double getDiscountLastMoney() {
return DiscountLastMoney;
}
public void setDiscountLastMoney(Double discountLastMoney) {
DiscountLastMoney = discountLastMoney;
}
public Double getOtherMoney() {
return OtherMoney;
}
public void setOtherMoney(Double otherMoney) {
OtherMoney = otherMoney;
}
public String getOtherMoneyList() {
return OtherMoneyList;
}
public void setOtherMoneyList(String otherMoneyList) {
OtherMoneyList = otherMoneyList;
}
public String getOtherMoneyItem() {
return OtherMoneyItem;
}
public void setOtherMoneyItem(String otherMoneyItem) {
OtherMoneyItem = otherMoneyItem;
}
public Integer getAccountDay() {
return AccountDay;
}
public void setAccountDay(Integer accountDay) {
AccountDay = accountDay;
}
public Boolean getStatus() {
return Status;
}
public void setStatus(Boolean status) {
Status = status;
}
}

118
src/main/java/com/jsh/model/vo/materials/DepotItemModel.java
View File

@@ -11,11 +11,25 @@ public class DepotItemModel implements Serializable
/**======开始接受页面参数=================**/
private Long HeaderId;
private Long MaterialId;
private String MUnit; //计量单位
private Double OperNumber;
private Double BasicNumber;
private Double UnitPrice;
private Double TaxUnitPrice; //含税单价
private Double AllPrice;
private String Remark = "";
private String Img = "";
private Long DepotId;
private Long AnotherDepotId;
private Double TaxRate;
private Double TaxMoney;
private Double TaxLastMoney;
private String OtherField1;
private String OtherField2;
private String OtherField3;
private String OtherField4;
private String OtherField5;
private String Inserted = ""; //json插入记录
private String Deleted = ""; //json删除记录
@@ -85,6 +99,22 @@ public class DepotItemModel implements Serializable
MaterialId = materialId;
}
public String getMUnit() {
return MUnit;
}
public void setMUnit(String MUnit) {
this.MUnit = MUnit;
}
public Double getTaxUnitPrice() {
return TaxUnitPrice;
}
public void setTaxUnitPrice(Double taxUnitPrice) {
TaxUnitPrice = taxUnitPrice;
}
public Double getOperNumber() {
return OperNumber;
}
@@ -93,6 +123,14 @@ public class DepotItemModel implements Serializable
OperNumber = operNumber;
}
public Double getBasicNumber() {
return BasicNumber;
}
public void setBasicNumber(Double basicNumber) {
BasicNumber = basicNumber;
}
public Double getUnitPrice() {
return UnitPrice;
}
@@ -244,4 +282,84 @@ public class DepotItemModel implements Serializable
public void setExcelStream(InputStream excelStream) {
this.excelStream = excelStream;
}
public Long getDepotId() {
return DepotId;
}
public void setDepotId(Long depotId) {
DepotId = depotId;
}
public Long getAnotherDepotId() {
return AnotherDepotId;
}
public void setAnotherDepotId(Long anotherDepotId) {
AnotherDepotId = anotherDepotId;
}
public Double getTaxRate() {
return TaxRate;
}
public void setTaxRate(Double taxRate) {
TaxRate = taxRate;
}
public Double getTaxMoney() {
return TaxMoney;
}
public void setTaxMoney(Double taxMoney) {
TaxMoney = taxMoney;
}
public Double getTaxLastMoney() {
return TaxLastMoney;
}
public void setTaxLastMoney(Double taxLastMoney) {
TaxLastMoney = taxLastMoney;
}
public String getOtherField1() {
return OtherField1;
}
public void setOtherField1(String otherField1) {
OtherField1 = otherField1;
}
public String getOtherField2() {
return OtherField2;
}
public void setOtherField2(String otherField2) {
OtherField2 = otherField2;
}
public String getOtherField3() {
return OtherField3;
}
public void setOtherField3(String otherField3) {
OtherField3 = otherField3;
}
public String getOtherField4() {
return OtherField4;
}
public void setOtherField4(String otherField4) {
OtherField4 = otherField4;
}
public String getOtherField5() {
return OtherField5;
}
public void setOtherField5(String otherField5) {
OtherField5 = otherField5;
}
}

126
src/main/java/com/jsh/model/vo/materials/MaterialModel.java
View File

@@ -1,5 +1,7 @@
package com.jsh.model.vo.materials;
import java.io.File;
import java.io.InputStream;
import java.io.Serializable;
@SuppressWarnings("serial")
@@ -12,7 +14,12 @@ public class MaterialModel implements Serializable
* 名称
*/
private String Name = "";
private String Mfrs = ""; //制造商
private Double Packing; //包装（KG/包）
private Double SafetyStock; //安全存量（KG）
/**
* 型号
*/
@@ -31,7 +38,7 @@ public class MaterialModel implements Serializable
/**
* 单位
*/
private String Unit = "";
private String Unit = "";
/**
* 零售价
@@ -57,6 +64,18 @@ public class MaterialModel implements Serializable
* 备注
*/
private String Remark = "";
private Long UnitId;
private String FirstOutUnit;
private String FirstInUnit;
private String PriceStrategy;
/**
* 导入excel文件
*/
private File materialFile;
private Boolean Enabled = true; //是否启用
/**
* CategoryId
@@ -93,6 +112,10 @@ public class MaterialModel implements Serializable
*/
private String clientIp = "";
private String browserType = ""; //浏览器类型
private String fileName = ""; //文件名称
private InputStream excelStream; //输入流，导出excel文件
public MaterialShowModel getShowModel() {
return showModel;
}
@@ -109,6 +132,30 @@ public class MaterialModel implements Serializable
Name = name;
}
public String getMfrs() {
return Mfrs;
}
public void setMfrs(String mfrs) {
Mfrs = mfrs;
}
public Double getPacking() {
return Packing;
}
public void setPacking(Double packing) {
Packing = packing;
}
public Double getSafetyStock() {
return SafetyStock;
}
public void setSafetyStock(Double safetyStock) {
SafetyStock = safetyStock;
}
public String getModel() {
return Model;
}
@@ -140,8 +187,8 @@ public class MaterialModel implements Serializable
public void setUnit(String unit) {
Unit = unit;
}
public void setRetailPrice(Double retailPrice)
public void setRetailPrice(Double retailPrice)
{
RetailPrice = retailPrice;
}
@@ -245,4 +292,75 @@ public class MaterialModel implements Serializable
CategoryIds = categoryIds;
}
public Long getUnitId() {
return UnitId;
}
public void setUnitId(Long unitId) {
UnitId = unitId;
}
public String getFirstOutUnit() {
return FirstOutUnit;
}
public void setFirstOutUnit(String firstOutUnit) {
FirstOutUnit = firstOutUnit;
}
public String getFirstInUnit() {
return FirstInUnit;
}
public void setFirstInUnit(String firstInUnit) {
FirstInUnit = firstInUnit;
}
public String getPriceStrategy() {
return PriceStrategy;
}
public void setPriceStrategy(String priceStrategy) {
PriceStrategy = priceStrategy;
}
public Boolean getEnabled() {
return Enabled;
}
public void setEnabled(Boolean enabled) {
Enabled = enabled;
}
public String getBrowserType() {
return browserType;
}
public void setBrowserType(String browserType) {
this.browserType = browserType;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public InputStream getExcelStream() {
return excelStream;
}
public void setExcelStream(InputStream excelStream) {
this.excelStream = excelStream;
}
public File getMaterialFile() {
return materialFile;
}
public void setMaterialFile(File materialFile) {
this.materialFile = materialFile;
}
}