梳理单位累计应收和应付的逻辑

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<AccountModel>

src/main/java/com/jsh/action/materials/AccountHeadAction.java

@@ -73,7 +73,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
             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<AccountHeadModel>
             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<AccountHeadModel>
     }
     
     /**
-     * 查询单位的累计应收和累计应付
+     * 查询单位的累计应收和累计应付，收预付款不计入此处
      * @return
      */
     public void findTotalPay() {
@@ -292,13 +292,11 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
 			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());
         }

src/main/java/com/jsh/action/materials/AccountItemAction.java

@@ -56,13 +56,16 @@ public class AccountItemAction extends BaseAction<AccountItemModel>
                     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<AccountItemModel>
                     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);
                 }

src/main/java/com/jsh/action/materials/DepotHeadAction.java

@@ -341,7 +341,7 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
 	}
     
     /**
-     * 查询单位的累计应收和累计应付
+     * 查询单位的累计应收和累计应付，零售不能计入
      * @return
      */
     public void findTotalPay() {