diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 932c8f9f7..c8d6c75d9 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -266,6 +266,38 @@ public class EmisSettleBillController extends BaseController return AjaxResult.success("成功",emisSettleBill); } + /** + * 获取结算总账单详细信息 + */ + @GetMapping(value = "/getSimpleInfoBySettleBillNo") + public AjaxResult getSimpleInfoBySettleBillNo(String settleBillNo) + { + EmisSettleBill emisSettleBill=emisBaseService.getSettleBillBySettleBillNo(settleBillNo); + + BigDecimal thisPayMoney=emisSettleBill.getRecMoney().subtract(emisSettleBill.getRecedMoney()); + emisSettleBill.setThisPayMoney(thisPayMoney); + + // subBillList , 返回子账单列表 +// List subBillList=emisBaseService.selectSubBillListBySettleBillNo(settleBillNo); +// emisSettleBill.setSubBillList(subBillList); + + try { + int isCanPay=emisSettleBillService.checkCanOnlinePay(emisSettleBill); + if(isCanPay==1) { + emisSettleBill.setBlLockOnlinePay("F"); + }else{ + emisSettleBill.setBlLockOnlinePay("T"); + emisSettleBill.setLockOnlinePayReason("该单不支持在线支付"); + } + } catch (EmisBizError emisBizError) { + emisBizError.printStackTrace(); + emisSettleBill.setBlLockOnlinePay("T"); + emisSettleBill.setLockOnlinePayReason("该单不支持在线支付:"+emisBizError.getMessage()); + } + + return AjaxResult.success("成功",emisSettleBill); + } + @GetMapping(value = "/checkCanOnlinePay") public AjaxResult checkCanOnlinePay(EmisSettleBill emisSettleBill) { diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index f090503ff..304f1adde 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -89,6 +89,29 @@ public class EmisSettleSubBillController extends EmisBaseController return getDataTable(list); } + /** + * 查询结算子账单列表-listSimple + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:list')") + @GetMapping("/listSimple") + public TableDataInfo listSimple(EmisSettleSubBill emisSettleSubBill) + { + startPage(); + + setPrivParams(emisSettleSubBill); + + if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ + emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode())); + String[] billCodeSortList = emisSettleSubBill.getBillCode().split(","); + if(billCodeSortList.length>1){ + emisSettleSubBill.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList)); + } + } + + List list = emisSettleSubBillService.selectEmisSettleSubBillList(emisSettleSubBill); + return getDataTable(list); + } + @GetMapping("/listHasOpenInvoiceMap") public TableDataInfo listHasOpenInvoiceMap(EmisSettleSubBill emisSettleSubBill) {