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

给出入库明细接口增加税率和税额字段

Browse Source
This commit is contained in:
季圣华
2022-08-25 22:24:35 +08:00
parent 57de1c4d93
commit a10fabb7ef
5 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -126,9 +126,9 @@ public class DepotHeadController {
String [] organArray = depotHeadService.getOrganArray(subType, "");
beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, creatorArray, organArray,
List<DepotHeadVo4InDetail> list = depotHeadService.findInDetail(beginTime, endTime, type, creatorArray, organArray,
StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findByAllCount(beginTime, endTime, type, creatorArray, organArray,
int total = depotHeadService.findInDetailCount(beginTime, endTime, type, creatorArray, organArray,
StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark);
map.put("total", total);
//存放数据json数组

4
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -61,7 +61,7 @@ public interface DepotHeadMapperEx {
String findMaterialsListByHeaderId(
@Param("id") Long id);
List<DepotHeadVo4InDetail> findByAll(
List<DepotHeadVo4InDetail> findInDetail(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@@ -75,7 +75,7 @@ public interface DepotHeadMapperEx {
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
int findInDetailCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,

30
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java
View File

@@ -26,6 +26,12 @@ public class DepotHeadVo4InDetail {
private BigDecimal AllPrice;
private BigDecimal taxRate;
private BigDecimal taxMoney;
private BigDecimal taxLastMoney;
private String SName;
private String DName;
@@ -116,6 +122,30 @@ public class DepotHeadVo4InDetail {
AllPrice = allPrice;
}
public BigDecimal getTaxRate() {
return taxRate;
}
public void setTaxRate(BigDecimal taxRate) {
this.taxRate = taxRate;
}
public BigDecimal getTaxMoney() {
return taxMoney;
}
public void setTaxMoney(BigDecimal taxMoney) {
this.taxMoney = taxMoney;
}
public BigDecimal getTaxLastMoney() {
return taxLastMoney;
}
public void setTaxLastMoney(BigDecimal taxLastMoney) {
this.taxLastMoney = taxLastMoney;
}
public String getSName() {
return SName;
}

8
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -486,24 +486,24 @@ public class DepotHeadService {
return result;
}
public List<DepotHeadVo4InDetail> findByAll(String beginTime, String endTime, String type, String [] creatorArray,
public List<DepotHeadVo4InDetail> findInDetail(String beginTime, String endTime, String type, String [] creatorArray,
String [] organArray, String materialParam, List<Long> depotList, Integer oId, String number,
String remark, Integer offset, Integer rows) throws Exception{
List<DepotHeadVo4InDetail> list = null;
try{
list =depotHeadMapperEx.findByAll(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark, offset, rows);
list =depotHeadMapperEx.findInDetail(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public int findByAllCount(String beginTime, String endTime, String type, String [] creatorArray,
public int findInDetailCount(String beginTime, String endTime, String type, String [] creatorArray,
String [] organArray, String materialParam, List<Long> depotList, Integer oId, String number,
String remark) throws Exception{
int result = 0;
try{
result =depotHeadMapperEx.findByAllCount(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark);
result =depotHeadMapperEx.findInDetailCount(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark);
}catch(Exception e){
JshException.readFail(logger, e);
}