From abc1287b9e78ca68f31c51f1d8baf152852135dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 30 Apr 2021 00:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/service/account/AccountService.java | 5 ++--- .../java/com/jsh/erp/service/depotHead/DepotHeadService.java | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java index 36e4d11f..30e23e22 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -525,13 +525,12 @@ public class AccountService { public String getAccountStrByIdAndMoney(Map accountMap, String accountIdList, String accountMoneyList){ StringBuffer sb = new StringBuffer(); - accountIdList = accountIdList.replace("[", "").replace("]", "").replace("\"", ""); - accountMoneyList = accountMoneyList.replace("[", "").replace("]", "").replace("\"", ""); List idList = StringUtil.strToLongList(accountIdList); List moneyList = StringUtil.strToLongList(accountMoneyList); for (int i = 0; i < idList.size(); i++) { Long id = idList.get(i); - sb.append(accountMap.get(id) + "(" + moneyList.get(i) + "元) "); + BigDecimal money = BigDecimal.valueOf(moneyList.get(i)).abs(); + sb.append(accountMap.get(id) + "(" + money + "元) "); } return sb.toString(); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 7e515ec6..fceb8d16 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -523,6 +523,8 @@ public class DepotHeadService { depotHead.setCreateTime(new Timestamp(System.currentTimeMillis())); depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT); depotHead.setPayType(depotHead.getPayType()==null?"现付":depotHead.getPayType()); + depotHead.setAccountIdList(depotHead.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", "")); + depotHead.setAccountMoneyList(depotHead.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "")); try{ depotHeadMapper.insertSelective(depotHead); }catch(Exception e){ @@ -574,6 +576,8 @@ public class DepotHeadService { BigDecimal preTotalPrice, Long tenantId,HttpServletRequest request)throws Exception { /**更新单据主表信息*/ DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class); + depotHead.setAccountIdList(depotHead.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", "")); + depotHead.setAccountMoneyList(depotHead.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "")); try{ depotHeadMapper.updateByPrimaryKeySelective(depotHead); }catch(Exception e){