From c9ddc1a8e77dd84c373d75ec8f386773e473cba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 8 Jan 2017 19:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=BF=9B=E9=94=80=E5=AD=98?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9A=84=E8=B4=A6=E6=88=B7=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E7=9A=84=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/action/basic/AccountAction.class  | Bin 10572 -> 12684 bytes
 .../action/materials/DepotHeadAction.class    | Bin 13796 -> 14125 bytes
 .../jsh/service/basic/AccountService.class    | Bin 860 -> 860 bytes
 .../spring/basic-applicationContext.xml       |   1 +
 WebRoot/js/pages/materials/in_out.js          |  11 +++-
 WebRoot/pages/materials/material.jsp          |   4 +-
 config/spring/basic-applicationContext.xml    |   1 +
 src/com/jsh/action/basic/AccountAction.java   |  49 +++++++++++++++++-
 .../jsh/action/materials/DepotHeadAction.java |   4 +-
 src/com/jsh/service/basic/AccountService.java |   5 +-
 10 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class
index 2c96015747ec259d8be89833fa243977c539c2f1..8cc15d1100bd89445c9e1cc45cb29f371fa97f86 100644
GIT binary patch
literal 12684
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

literal 10572
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

diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class
index 40d780eedfd6ec8f747f31381e421ff5ed7d81be..f2b3429635cf23e94df8301ccfabe5cbfa4fb7fc 100644
GIT binary patch
delta 1889
zcmb7E-A@!(6hG(ezz)Lz;=r=Ae29Q7EFiLoTBukRtXdEi6j2lhb_y%&E-s6$sp-Bn
z(U(5xP1^($n>1-ilQylvjG&2$FKyC?{slFSP1A>_P19OiYgKw?zl7GL>C4=Ee&=_-
z&z<ikKM5;eKD~Jx0Q?lXrd)H!6}*oRocJ5Us#C^Uqd8=R$D6w%Gov9>#ozG{gxo+v
zI&6eyOaw<=eV2lN;$KdDgpmKtrq_r~sQ4J4Fvl33Mv&^dZ0dbnQXxoyP|QHjGlN8s
zEVDx<61UyDLXryia9*ZtanG%9CK*8)h{TN0{%CN_RA3Ummnjz^`=EK+h)&wTk22*W
zP-IHME3`_bLRu|a^s2fdm5RxQ;G8g~_nEK95@{cm$<0|sBd<*>_%=FZDiv?&tyn()
zsqVs(x)mMhk41ywaVPo2*Pi;?CY9Dh6%)qI*v?2e5R3&Q;oYVYP{>Og?DAR=YQ-go
zCOS)t3tADd(N?vow23y0(b78EOE0L@P95TMsTa43o2ADpcOVod+A$LghMIR9(-XbM
zltSAfPo{1Jx47fh;v?Y^^NdU{bFcSDBd5%<*q%TN+k=oZaBj*RnNCn%K~Vc=MwcPI
z2zmQvPLG;Vri6l%rc8YZ1$|RybRc-zwi}O`XB5b%11cQ^?vBa@?l8xLVOuZL0CudP
zhf?&zDh=9nh3VblK$1MfGUqlu5{U-Ps7%KMmG`+vR63dV+#3nUCX(b)5iEZ%dqSl#
z3e0C$G^#mwK>`_ou80obU>=n<F5*>$_Ut)w&cE*)!}u4Fqv7>ADAcno{Kdjw7x3W%
zKDBUmP<LvC43i^G%1uZXT4{CGbJdG!wbNGTq^<1`l(RB~$uSfgSJO6m(gMDd5G37c
zQNf^|y+|6u?2`vg8kOjht@AZmq+6IZ2d*BCJPixbJqNjbEwiuJfVkwh=mKs@oR`Hy
z<4pWpTuq1?Rbmk@LNWEDi%wz*O(0SfJ#-$+*rI|iVkKS1DiT;jvsep7{H})~$8I7N
zgNr4Z;xGtD`0=&TL8_oN9B(V_rAk^04md=9s-kLc{1iUKPTU4ra1MX&q#9N`=^{8`
z2)6^0NZfX?n`7+M#ZD5AX<f!~En~+49FL$v{Ls{iUU6wdjpTJwy*RMG=9%afSC@<b
z(yk!?f34(Qf;@3=!`kPBexA1s-)X11#BcbgCS6pu)MJC_Y4KsBIN|e%OD%QBn{Qw>
zPai+Fuumhuh3hPAYM0U@U;0XycsoA?O_v;eWd?1uXiK}qtMKA~t%7j*-z`o~rxnho
zrn3dkP^Y-#Z^^aW+yHO#{A$G$e>r!vwAI7kO|2CT+jt;EFF`H<R`X1GpWuUAw0-CX
z?d<Vghe8X!`5cNGH0l!ZR!@9a5<9;LTOBaS@a`lK&H#IpKr92K++4^2`w|S=p8@)l
zz@ZFqM5CiA;WJK10*$|ZP(ipi?urk?;nXUre9ACO!*rZ)yg<CY^cbq0(COi__@~R?
zWhKISUQxTm_30A1g8o~$W+<7#i3PF;rIC>w(6SsHi5&8|MdI$ps`7v4P@BpD?LU$z
qYioCy^r{$Y+fy=zA8~HnU$EzZd}jG98W)RgWd%W&h)$(aoctRCG@(=g

delta 1754
zcmah}TTC2P82<l%mz`l5O6jn$!>zO|6c!ffaw$>)q0oYIvrs5df?IY1Tb5l|mTHqm
zVtnXRAIwQLqS2&DLrgT0&`iM^t1p_=q)8urGDhP=V|?&_LGYiwV8yC0bI$*L-}$fS
z%sZj4X6<*k-}?Xnyfm?9UvpYy{9d$b+7$k%z!$hK<If0=wqP(k<%<Twp@B&Ff<6`P
z^Udip{)%893P*jxfk<FVx5F%aE#nq~?X*7Ui_Dt9H!|)ZP<Y;suMsLlWI?d_{C@T-
zUb3j-o@OgcQOHITf;8h>?9-o%vZAbfOr}%>Yb5;aq8+cIMJ7dTX|=d-y(Tvsb2Nng
z7kn3e)j?lqx_U4g352F4$`ccL<)wuR9fZRynAW2w!Xbaa%)CqY`R(MSLka|l$<kQ(
zJ9&-_7XntARH;Hos7!pBS0+2jtxyG33N`--R*B>J<Hu_eGGh^!qJdy_mv3>V*Eeq`
zFQm)VfZ+T`le+zrp-Fu~rbcl;UtMlONFBN~uTL(<z{e4k!KL#LAuR~$eM@ua^$1IX
zfmvOqClE6F=k>@?V9q=@9n}}?u#egmIss00zy-GJ(}9r5%hdUIbughmrBD|*i+ETp
z?+p3l;wRbW3>PQE5x*XhsYkq6(C-{j=;@^A-f$>76BiGP2L-R#Mim;OGwW9hE0t6S
zSU?7#Iq|-GBptu4+{8B!nry51*?LjM6fPUMGNMT;ey61v_`@fVs^ZO6NQ+qp8cF)6
zN79=~`WKV_EouF3T7M+1ZR-YJiy2l;G6+UA+a_5NR<?^h>M@cvt4X>&2H6cvS%vH#
zmC`CUpp(<!ZMwN#1L7ivX%rh{t6xlemX<%o1NZ<{zJOVjgAOXeZ1Q3bH6c<5=29Q#
z^NB(l!y@wIVbak>K`ezVen{sa)ocqmAe$|j+c^Sf0im8;ltKGBUNhxWCLQ1go*^r#
zlm%9p$Gg~qt&jqj@S_%TFfGv-NHB_RfTYKE?d)cpoo2I>m}AP`b)3W41c2ok$Q7?v
zwV+ensdibN66J~)YFu$sV$-<;L*jnTp+^c#z4I^qp5y<`CY-ze)p<ftCtk18#H_a*
z^Tjo<8w<pT-u8*2TUcxk_iY3FRVp^H#6VAzH966pdzzK+&kayDtA)3$pb~@1o2(v{
zJpVUnF<JYvBi{R3xR~gDBP>w0u-6^!Fq>Eb&+~K=O@xym?Z7FJBtQv@C45uDtK1oo
z@CJZ;hbNq}hZ4(mh08TO8=|9-27tvpUcOpz{Wf_=Z&6*3`zB->@cGA(RiRRS!rFvp
z3yj2#%W>*h!irO@eJl=yc7fw@Ai4`Q$AOwFyGUycp|)M1BMzM01-eywO7zr^`+H$H
zajg_yWmutJ>f;?>Ca#mVxPEBK<+}Kn%HM}-gv)$g%^ItcHFCBcxAEX;JXrq*nPXMy
zv`A}cF4!BWG!Y2RpNh~Mnk>UKBCa=dw-4c4oB($bN_a(HQ``ofeU~=`Dt~P;5M%Gn
POn~^QnBVb4dguNGM8|ea

diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/basic/AccountService.class b/WebRoot/WEB-INF/classes/com/jsh/service/basic/AccountService.class
index 41f58d2f38fc4ec4e1e932f77d55385d1f2538f1..bf1cba8fdc9e739a3e9b25c695e44e62c3159b0e 100644
GIT binary patch
delta 29
lcmcb^c86`l3MNLj$t#&`S$P>)8Tcl@X7XVao@~La0sw^p2bcf=

delta 29
lcmcb^c86`l3MNMO$t#&`S@{@P8Tco^X7XVanQXzV0sw_I2b=%^

diff --git a/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml b/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml
index ec9d563d..9d1e86fe 100644
--- a/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml
+++ b/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml
@@ -306,6 +306,7 @@
     <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
     <bean id="accountAction" class="com.jsh.action.basic.AccountAction" scope="prototype">
         <property name="accountService" ref="accountService"/>
+        <property name="depotHeadService" ref="depotHeadService"/>
         <property name="logService" ref="logService"/>
     </bean>
 	<!--结算账户配置结束 -->
diff --git a/WebRoot/js/pages/materials/in_out.js b/WebRoot/js/pages/materials/in_out.js
index f81d7f6b..6572a552 100644
--- a/WebRoot/js/pages/materials/in_out.js
+++ b/WebRoot/js/pages/materials/in_out.js
@@ -740,12 +740,19 @@
 				else 
 				{
 					var OrganId = null, AllocationProjectId = null;
+					var ChangeAmount = $.trim($("#ChangeAmount").val());
+					var TotalPrice = $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text();					
 					if(listSubType !=="调拨"){
 						OrganId = $('#OrganId').combobox('getValue');
 					}
 					else {
 						AllocationProjectId = $.trim($("#AllocationProjectId").val()); //收货仓库-对方
 					}
+					if(listSubType === "采购"||listSubType === "销售退货"){
+						//付款为负数
+						ChangeAmount = 0 - ChangeAmount;
+						TotalPrice = 0 - TotalPrice;
+					}
 					$.ajax({
 						type:"post",
 						url: url,
@@ -761,8 +768,8 @@
 							OrganId: OrganId,
 							HandsPersonId: $.trim($("#HandsPersonId").val()),
 							AccountId: $.trim($("#AccountId").val()),
-							ChangeAmount: $.trim($("#ChangeAmount").val()),
-							TotalPrice: $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text(),
+							ChangeAmount: ChangeAmount, //付款/收款
+							TotalPrice: TotalPrice, //合计
 							Remark: $.trim($("#Remark").val()),
 							clientIp: clientIp
 						}),
diff --git a/WebRoot/pages/materials/material.jsp b/WebRoot/pages/materials/material.jsp
index c4c0412a..f8139648 100644
--- a/WebRoot/pages/materials/material.jsp
+++ b/WebRoot/pages/materials/material.jsp
@@ -323,8 +323,8 @@
 			          { title: '最低售价',field: 'LowPrice',width:70},
 			          { title: '预设售价一',field: 'PresetPriceOne',width:70},
 			          { title: '预设售价二',field: 'PresetPriceTwo',width:70},
-			          { title: '备注',field: 'Remark',width:110},
-			          { title: '操作',field: 'op',align:"center",width:120,formatter:function(value,rec)
+			          { title: '备注',field: 'Remark',width:90},
+			          { title: '操作',field: 'op',align:"center",width:150,formatter:function(value,rec)
 			         	{
 							var str = '';
 							var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model + 'AaBb' + rec.Color + 'AaBb' + rec.Unit + 'AaBb' + rec.RetailPrice + 'AaBb' + rec.LowPrice + 'AaBb' + rec.PresetPriceOne + 'AaBb' + rec.PresetPriceTwo + 'AaBb' + rec.Remark;
diff --git a/config/spring/basic-applicationContext.xml b/config/spring/basic-applicationContext.xml
index ec9d563d..9d1e86fe 100644
--- a/config/spring/basic-applicationContext.xml
+++ b/config/spring/basic-applicationContext.xml
@@ -306,6 +306,7 @@
     <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
     <bean id="accountAction" class="com.jsh.action.basic.AccountAction" scope="prototype">
         <property name="accountService" ref="accountService"/>
+        <property name="depotHeadService" ref="depotHeadService"/>
         <property name="logService" ref="logService"/>
     </bean>
 	<!--结算账户配置结束 -->
diff --git a/src/com/jsh/action/basic/AccountAction.java b/src/com/jsh/action/basic/AccountAction.java
index 16bf7582..ea7c38d6 100644
--- a/src/com/jsh/action/basic/AccountAction.java
+++ b/src/com/jsh/action/basic/AccountAction.java
@@ -10,10 +10,12 @@ import net.sf.json.JSONObject;
 import org.springframework.dao.DataAccessException;
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
+import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.po.Account;
 import com.jsh.model.vo.basic.AccountModel;
 import com.jsh.service.basic.AccountIService;
+import com.jsh.service.materials.DepotHeadIService;
 import com.jsh.util.PageUtil;
 /**
  * 结算账户
@@ -23,7 +25,8 @@ import com.jsh.util.PageUtil;
 public class AccountAction extends BaseAction<AccountModel>
 {
     private AccountIService accountService;
-    private AccountModel model = new AccountModel();
+    private DepotHeadIService depotHeadService;
+	private AccountModel model = new AccountModel();
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public String getAccount()
@@ -290,7 +293,7 @@ public class AccountAction extends BaseAction<AccountModel>
                     item.put("name", account.getName());
                     item.put("serialNo", account.getSerialNo());
                     item.put("initialAmount", account.getInitialAmount());
-                    item.put("currentAmount", account.getCurrentAmount());
+                    item.put("currentAmount", getAccountSum(account.getId()) + account.getInitialAmount());
                     item.put("remark", account.getRemark());
                     item.put("op", 1);
                     dataArray.add(item);
@@ -309,6 +312,31 @@ public class AccountAction extends BaseAction<AccountModel>
             Log.errorFileSync(">>>>>>>>>回写查询结算账户信息结果异常", e);
         }
     }
+    /**
+     * 单个账户的金额求和
+     * @param id
+     * @return
+     */
+    public Double getAccountSum(Long id){
+    	Double accountSum = 0.0;
+    	try{	    	
+	    	PageUtil<DepotHead> pageUtil = new PageUtil<DepotHead>();
+	    	pageUtil.setPageSize(0);
+	        pageUtil.setCurPage(0);
+	        pageUtil.setAdvSearch(getCondition_getSum(id));        
+			depotHeadService.find(pageUtil);
+			List<DepotHead> dataList = pageUtil.getPageList();
+	        if(dataList!= null){
+	            for(DepotHead depotHead:dataList){
+	                accountSum = accountSum + depotHead.getChangeAmount();
+	            }
+	        }
+        }
+        catch (DataAccessException e){
+            Log.errorFileSync(">>>>>>>>>查找进销存信息异常", e);
+        }
+        return accountSum;
+    }
 
     /**
      * 查找结算账户信息-下拉框
@@ -380,6 +408,20 @@ public class AccountAction extends BaseAction<AccountModel>
         condition.put("id_s_order", "desc");
         return condition;
     }
+    
+    /**
+     * 拼接搜索条件-结算账户当前余额求和
+     * @return
+     */
+    private Map<String,Object> getCondition_getSum(Long id)
+    {
+        /**
+         * 拼接搜索条件
+         */
+        Map<String,Object> condition = new HashMap<String,Object>();
+        condition.put("AccountId_n_eq", id);
+        return condition;
+    }
 
     //=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
     @Override
@@ -391,4 +433,7 @@ public class AccountAction extends BaseAction<AccountModel>
     {
         this.accountService = accountService;
     }
+    public void setDepotHeadService(DepotHeadIService depotHeadService) {
+		this.depotHeadService = depotHeadService;
+	}
 }
diff --git a/src/com/jsh/action/materials/DepotHeadAction.java b/src/com/jsh/action/materials/DepotHeadAction.java
index c903a0af..427ce27b 100644
--- a/src/com/jsh/action/materials/DepotHeadAction.java
+++ b/src/com/jsh/action/materials/DepotHeadAction.java
@@ -270,10 +270,10 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
                     item.put("HandsPersonName", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getName());
                     item.put("AccountId", depotHead.getAccountId()==null?"":depotHead.getAccountId().getId());
                     item.put("AccountName", depotHead.getAccountId()==null?"":depotHead.getAccountId().getName());
-                    item.put("ChangeAmount", depotHead.getChangeAmount());
+                    item.put("ChangeAmount", depotHead.getChangeAmount()==null?"":Math.abs(depotHead.getChangeAmount()));
                     item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId());
                     item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName());                    
-                    item.put("TotalPrice", depotHead.getTotalPrice());
+                    item.put("TotalPrice", depotHead.getTotalPrice()==null?"":Math.abs(depotHead.getTotalPrice()));
                     item.put("Remark", depotHead.getRemark());
                     item.put("op", 1);
                     dataArray.add(item);
diff --git a/src/com/jsh/service/basic/AccountService.java b/src/com/jsh/service/basic/AccountService.java
index 982f64b6..8d1d133b 100644
--- a/src/com/jsh/service/basic/AccountService.java
+++ b/src/com/jsh/service/basic/AccountService.java
@@ -1,5 +1,4 @@
 package com.jsh.service.basic;
-
 import com.jsh.base.BaseService;
 import com.jsh.dao.basic.AccountIDAO;
 import com.jsh.model.po.Account;
@@ -9,11 +8,11 @@ public class AccountService extends BaseService<Account> implements AccountIServ
     @SuppressWarnings("unused")
     private AccountIDAO accountDao;
 
-    public void setAccountDao(AccountIDAO accountDao)
+	public void setAccountDao(AccountIDAO accountDao)
     {
         this.accountDao = accountDao;
     }
-
+    
     @Override
     protected Class<Account> getEntityClass()
     {