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

优化预付款的功能

Browse Source
This commit is contained in:
季圣华
2017-06-29 00:27:19 +08:00
parent f8f61c64db
commit a9377a0669
7 changed files with 141 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/jsh/action/basic/AccountAction.java
View File

@@ -423,6 +423,7 @@ public class AccountAction extends BaseAction<AccountModel>
*/
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("AccountId_n_eq", id);
condition.put("PayType_s_neq", "预付款");
if(!monthTime.equals("")){
condition.put("OperTime_s_gteq", monthTime + "-01 00:00:00");
condition.put("OperTime_s_lteq", monthTime + "-31 00:00:00");

1
src/main/java/com/jsh/action/basic/SupplierAction.java
View File

@@ -421,6 +421,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
item.put("id", supplier.getId());
//客户名称
item.put("supplier", supplier.getSupplier());
item.put("advanceIn", supplier.getAdvanceIn()); //预付款金额
dataArray.add(item);
}
}

1
src/main/java/com/jsh/action/materials/DepotHeadAction.java
View File

@@ -282,6 +282,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId());
item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName());
item.put("TotalPrice", depotHead.getTotalPrice()==null?"":Math.abs(depotHead.getTotalPrice()));
item.put("payType", depotHead.getPayType()==null?"":depotHead.getPayType());
item.put("Remark", depotHead.getRemark());
item.put("op", 1);
dataArray.add(item);