From a520b0ddd10a4dc0538e6fa27b7f6533a070dfa5 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, 7 Jul 2017 00:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A2=B3=E7=90=86=E5=8D=95=E4=BD=8D=E7=B4=AF?= =?UTF-8?q?=E8=AE=A1=E5=BA=94=E6=94=B6=E5=92=8C=E5=BA=94=E4=BB=98=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsh/action/basic/AccountAction.java | 2 +- .../com/jsh/action/materials/AccountHeadAction.java | 10 ++++------ .../com/jsh/action/materials/AccountItemAction.java | 10 ++++++++-- .../java/com/jsh/action/materials/DepotHeadAction.java | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/jsh/action/basic/AccountAction.java b/src/main/java/com/jsh/action/basic/AccountAction.java index 6a3989b3..747cb4d1 100644 --- a/src/main/java/com/jsh/action/basic/AccountAction.java +++ b/src/main/java/com/jsh/action/basic/AccountAction.java @@ -26,7 +26,7 @@ import com.jsh.util.PageUtil; import com.jsh.util.Tools; /** * 结算账户 - * @author ji sheng hua qq752718920 + * @author ji sheng hua qq7527-18920 */ @SuppressWarnings("serial") public class AccountAction extends BaseAction diff --git a/src/main/java/com/jsh/action/materials/AccountHeadAction.java b/src/main/java/com/jsh/action/materials/AccountHeadAction.java index ed8e3264..76baf96f 100644 --- a/src/main/java/com/jsh/action/materials/AccountHeadAction.java +++ b/src/main/java/com/jsh/action/materials/AccountHeadAction.java @@ -73,7 +73,7 @@ public class AccountHeadAction extends BaseAction accountHead.setType(model.getType()); if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));} if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - accountHead.setChangeAmount(model.getChangeAmount()); + accountHead.setChangeAmount(model.getChangeAmount()==null ? 0:model.getChangeAmount()); accountHead.setTotalPrice(model.getTotalPrice()); if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));} accountHead.setBillNo(model.getBillNo()); @@ -159,7 +159,7 @@ public class AccountHeadAction extends BaseAction accountHead.setType(model.getType()); if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));} if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - accountHead.setChangeAmount(model.getChangeAmount()); + accountHead.setChangeAmount(model.getChangeAmount()==null ? 0:model.getChangeAmount()); accountHead.setTotalPrice(model.getTotalPrice()); if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));} accountHead.setBillNo(model.getBillNo()); @@ -283,7 +283,7 @@ public class AccountHeadAction extends BaseAction } /** - * 查询单位的累计应收和累计应付 + * 查询单位的累计应收和累计应付，收预付款不计入此处 * @return */ public void findTotalPay() { @@ -292,13 +292,11 @@ public class AccountHeadAction extends BaseAction JSONObject outer = new JSONObject(); Double sum = 0.0; String getS = model.getSupplierId(); - //进销部分 + //收付款部分 sum = sum - (allMoney(getS, "付款", "合计") + allMoney(getS, "付款", "实际")); sum = sum + (allMoney(getS, "收款", "合计") + allMoney(getS, "收款", "实际")); sum = sum - (allMoney(getS, "收入", "合计") - allMoney(getS, "收入", "实际")); sum = sum + (allMoney(getS, "支出", "合计") - allMoney(getS, "支出", "实际")); - //收付款部分 - outer.put("getAllMoney", sum); toClient(outer.toString()); } diff --git a/src/main/java/com/jsh/action/materials/AccountItemAction.java b/src/main/java/com/jsh/action/materials/AccountItemAction.java index b55f83d8..74317bf2 100644 --- a/src/main/java/com/jsh/action/materials/AccountItemAction.java +++ b/src/main/java/com/jsh/action/materials/AccountItemAction.java @@ -56,13 +56,16 @@ public class AccountItemAction extends BaseAction accountItem.setHeaderId(new AccountHead(headerId)); if(tempInsertedJson.get("AccountId")!=null&&!tempInsertedJson.get("AccountId").equals("")){accountItem.setAccountId(new Account(tempInsertedJson.getLong("AccountId")));} if(tempInsertedJson.get("InOutItemId")!=null&&!tempInsertedJson.get("InOutItemId").equals("")){accountItem.setInOutItemId(new InOutItem(tempInsertedJson.getLong("InOutItemId")));} - if(tempInsertedJson.get("EachAmount")!=null){ + if(tempInsertedJson.get("EachAmount")!=null&&!tempInsertedJson.get("EachAmount").equals("")){ Double eachAmount = tempInsertedJson.getDouble("EachAmount"); if(listType.equals("付款")) { eachAmount = 0 - eachAmount; } accountItem.setEachAmount(eachAmount); } + else { + accountItem.setEachAmount(0.0); + } accountItem.setRemark(tempInsertedJson.getString("Remark")); accountItemService.create(accountItem); } @@ -84,13 +87,16 @@ public class AccountItemAction extends BaseAction accountItem.setHeaderId(new AccountHead(headerId)); if(tempUpdatedJson.get("AccountId")!=null&&!tempUpdatedJson.get("AccountId").equals("")){accountItem.setAccountId(new Account(tempUpdatedJson.getLong("AccountId")));} if(tempUpdatedJson.get("InOutItemId")!=null&&!tempUpdatedJson.get("InOutItemId").equals("")){accountItem.setInOutItemId(new InOutItem(tempUpdatedJson.getLong("InOutItemId")));} - if(tempUpdatedJson.get("EachAmount")!=null){ + if(tempUpdatedJson.get("EachAmount")!=null&&!tempUpdatedJson.get("EachAmount").equals("")){ Double eachAmount = tempUpdatedJson.getDouble("EachAmount"); if(listType.equals("付款")) { eachAmount = 0 - eachAmount; } accountItem.setEachAmount(eachAmount); } + else { + accountItem.setEachAmount(0.0); + } accountItem.setRemark(tempUpdatedJson.getString("Remark")); accountItemService.create(accountItem); } diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java index c8190d14..6d48429a 100644 --- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java +++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java @@ -341,7 +341,7 @@ public class DepotHeadAction extends BaseAction } /** - * 查询单位的累计应收和累计应付 + * 查询单位的累计应收和累计应付，零售不能计入 * @return */ public void findTotalPay() {