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

优化收款单

Browse Source
This commit is contained in:
季圣华
2021-06-29 01:07:03 +08:00
parent 72ac4ce1a8
commit 225eb16bba
11 changed files with 144 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jshERP-boot/src/main/java/com/jsh/erp/controller/AccountItemController.java
View File

@@ -51,6 +51,7 @@ public class AccountItemController {
item.put("accountName", ai.getAccountName());
item.put("inOutItemId", ai.getInOutItemId());
item.put("inOutItemName", ai.getInOutItemName());
item.put("billNumber", ai.getBillNumber());
BigDecimal eachAmount = ai.getEachAmount();
item.put("eachAmount", (eachAmount.compareTo(BigDecimal.ZERO))==-1 ? BigDecimal.ZERO.subtract(eachAmount): eachAmount);
item.put("remark", ai.getRemark());

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java
View File

@@ -11,6 +11,8 @@ public class AccountItem {
private Long inOutItemId;
private Long billId;
private BigDecimal eachAmount;
private String remark;
@@ -51,6 +53,14 @@ public class AccountItem {
this.inOutItemId = inOutItemId;
}
public Long getBillId() {
return billId;
}
public void setBillId(Long billId) {
this.billId = billId;
}
public BigDecimal getEachAmount() {
return eachAmount;
}

60
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java
View File

@@ -345,6 +345,66 @@ public class AccountItemExample {
return (Criteria) this;
}
public Criteria andBillIdIsNull() {
addCriterion("bill_id is null");
return (Criteria) this;
}
public Criteria andBillIdIsNotNull() {
addCriterion("bill_id is not null");
return (Criteria) this;
}
public Criteria andBillIdEqualTo(Long value) {
addCriterion("bill_id =", value, "billId");
return (Criteria) this;
}
public Criteria andBillIdNotEqualTo(Long value) {
addCriterion("bill_id <>", value, "billId");
return (Criteria) this;
}
public Criteria andBillIdGreaterThan(Long value) {
addCriterion("bill_id >", value, "billId");
return (Criteria) this;
}
public Criteria andBillIdGreaterThanOrEqualTo(Long value) {
addCriterion("bill_id >=", value, "billId");
return (Criteria) this;
}
public Criteria andBillIdLessThan(Long value) {
addCriterion("bill_id <", value, "billId");
return (Criteria) this;
}
public Criteria andBillIdLessThanOrEqualTo(Long value) {
addCriterion("bill_id <=", value, "billId");
return (Criteria) this;
}
public Criteria andBillIdIn(List<Long> values) {
addCriterion("bill_id in", values, "billId");
return (Criteria) this;
}
public Criteria andBillIdNotIn(List<Long> values) {
addCriterion("bill_id not in", values, "billId");
return (Criteria) this;
}
public Criteria andBillIdBetween(Long value1, Long value2) {
addCriterion("bill_id between", value1, value2, "billId");
return (Criteria) this;
}
public Criteria andBillIdNotBetween(Long value1, Long value2) {
addCriterion("bill_id not between", value1, value2, "billId");
return (Criteria) this;
}
public Criteria andEachAmountIsNull() {
addCriterion("each_amount is null");
return (Criteria) this;

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountItemVo4List.java
View File

@@ -8,6 +8,8 @@ public class AccountItemVo4List extends AccountItem {
private String inOutItemName;
private String billNumber;
public String getAccountName() {
return accountName;
}
@@ -23,4 +25,12 @@ public class AccountItemVo4List extends AccountItem {
public void setInOutItemName(String inOutItemName) {
this.inOutItemName = inOutItemName;
}
public String getBillNumber() {
return billNumber;
}
public void setBillNumber(String billNumber) {
this.billNumber = billNumber;
}
}

8
jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
View File

@@ -12,6 +12,7 @@ import com.jsh.erp.datasource.mappers.AccountItemMapperEx;
import com.jsh.erp.datasource.vo.AccountItemVo4List;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.depotHead.DepotHeadService;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.StringUtil;
@@ -34,13 +35,14 @@ public class AccountItemService {
@Resource
private AccountItemMapper accountItemMapper;
@Resource
private AccountItemMapperEx accountItemMapperEx;
@Resource
private LogService logService;
@Resource
private UserService userService;
@Resource
private DepotHeadService depotHeadService;
public AccountItem getAccountItem(long id)throws Exception {
AccountItem result=null;
@@ -199,6 +201,10 @@ public class AccountItemService {
if (tempInsertedJson.get("inOutItemId") != null && !tempInsertedJson.get("inOutItemId").equals("")) {
accountItem.setInOutItemId(tempInsertedJson.getLong("inOutItemId"));
}
if (tempInsertedJson.get("billNumber") != null && !tempInsertedJson.get("billNumber").equals("")) {
String billNo = tempInsertedJson.getString("billNumber");
accountItem.setBillId(depotHeadService.getDepotHead(billNo).getId());
}
if (tempInsertedJson.get("eachAmount") != null && !tempInsertedJson.get("eachAmount").equals("")) {
BigDecimal eachAmount = tempInsertedJson.getBigDecimal("eachAmount");
if (type.equals("付款")) {

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

@@ -670,4 +670,19 @@ public class DepotHeadService {
public BigDecimal getBuyAndSaleRetailStatistics(String type, String subType, Integer hasSupplier, String beginTime, String endTime) {
return depotHeadMapperEx.getBuyAndSaleRetailStatistics(type, subType, hasSupplier, beginTime, endTime);
}
public DepotHead getDepotHead(String number)throws Exception {
DepotHead depotHead = new DepotHead();
try{
DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andNumberEqualTo(number).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<DepotHead> list = depotHeadMapper.selectByExample(example);
if(null!=list && list.size()>0) {
depotHead = list.get(0);
}
}catch(Exception e){
JshException.readFail(logger, e);
}
return depotHead;
}
}