From fd80ad6c43c7e830d5e9f0bf5db7098b430275ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 8 Jul 2020 23:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/easyui/themes/icon.css                |   3 +++
 erp_web/js/easyui/themes/icons/nullify.png       | Bin 0 -> 1537 bytes
 .../jsh/erp/controller/DepotItemController.java  |   4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 erp_web/js/easyui/themes/icons/nullify.png

diff --git a/erp_web/js/easyui/themes/icon.css b/erp_web/js/easyui/themes/icon.css
index 269a6d66..542b8b20 100644
--- a/erp_web/js/easyui/themes/icon.css
+++ b/erp_web/js/easyui/themes/icon.css
@@ -108,4 +108,7 @@
 }
 .icon-user{
 	background:url('icons/user.png') no-repeat center center;
+}
+.icon-nullify{
+	background:url('icons/nullify.png') no-repeat center center;
 }
\ No newline at end of file
diff --git a/erp_web/js/easyui/themes/icons/nullify.png b/erp_web/js/easyui/themes/icons/nullify.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b0e7e2f86311db9371c9bdb59e9af6383554c75
GIT binary patch
literal 1537
zcmcgse@q)y9KVKO77#~fR^24zc7WNK{c%7Gy-}d;mC=nh9W6gp;?^GroN#yLdeFij
z3MLzv%>*;XjG5bv+cE=^ZAK>!BL=fU#KpvECRs?>FF_`X_+uu0@A=Ar@rRlJ`EvK(
z`+oEJe1GS??sn}=N!px55JZZjjIF?DYW!c9fcLGM^&Wg|QtUN~N2*gIKA9sdLCMdN
z4#8K?RdBvwTk|+qNDv9BythWFah5XyNznS@7;RJtVKzY&7Dq$AKqIG+ey*Mu&D1ZK
zKBq`NXr`(SPQ5c^;~My~cA4|EyS#z+#(*hE6&I0(Q3e|jIK@Xsg(fk~M9tKaT?XId
zY8^!`L6k-_^&qGkr<=4%GDjM;xtf5Urb(kwOXnGkM*2B2M^ESI^!PJs=sd<?WODM!
z<wap{a<Go6U`v;MVaZH2C`yRY=^~McHj=BA<a!-#GMVBwa&j~np$WH%iZ7}W!x<|U
zSS}op`H;d(A{n>n^Ghv?nZl7iNI?iWovVh$@N%JW$#hX)NJne+Izfo%wS*2U72Lxx
z{uLeewuLxd1s9fD<N)qRUB(I-*Y44d;y@e?!%Be`ffE%6Yo@S98{~tGi8knMr8KM0
zD=naDyTxR&nhLCXgN?Sc1*Tlf3fCcq6`vU3R=E5_uI-Ur#wK$<MUuUe)U?t)cY~xz
z;RY#0+B`<GniqpoBpfg7a-5vZw{pQ!SrW*l$}s#I@A<6FVld{~^|Z}sD6r)ltZb<f
zXOU;ITJ1J#DYeWAuF3X4IXdiI7jNU5wyvn~ti-RYLyCpfG3P`)+cF;FeZ6jhAXK~D
z<z74d>;hsl;qZCLW}?M~Sn~^LZU$WJM*#;MAA!|7;M8?=Zx%66!yTJZ27&(i1OC1U
z=VsvWIdt_hxOy4UPe8E>xb)DI4{9y&!f8-z1yu|JF&Od3!nLtuZ@?xG9DEn-)}W8y
zht-9kZ$Hwe#2Q@i&NQ6725)>1-|9kt--n|^V7C^WIs(odjh*fThuXlwDEj#)l%;}M
zD%9iwI8<#i7&rl^et`F8p(7jYZw8enRFsbP+TpMB2mlm|A$u0!%F&C(@Z~*lVif&&
z3uUiEcW<Kme<Dp1{AMh6q6Z#ogVQ(Q{2b^M(84^pbPfoWu>T!c_zd#z1Ovz6SEK0K
z1U%IXOGv<GAqxcsFPi)oSx8Wl4#q~nOE%=lhB(u_4G5v;FVAxLSrL^Amj{dg-y%*X
z7Up8l7agp{8=drz*%KZg8uC9+r==agJ1{A_JK1N|YIU)8W0&_V@m^6+-G}QBpTB(|
zNw4D5byZh7#@yXRLK%NxPw#LSS<|tpJ8`1JKRwkN(sZ8LGB_kJe381bMAe$S?StCK
zrqVu9Z?UH&J~^IO*{$}SeC5@^_PHik_eb+2bJYCy-mlfv$W#5dM%8cLKIZS)mZUE0
z`_7wR9@#LS^4k$2S)VzxYx}_~vv)qdzO^&att#nI5sPI`=XCAx&G@72u)Ekn>%Q0i
E0Zs0$8vp<R

literal 0
HcmV?d00001

diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 2554ae28..116dc513 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -178,8 +178,10 @@ public class DepotItemController {
                     String materialOther = getOtherInfo(mpArr, diEx);
                     MaterialName = MaterialName + materialOther + ((diEx.getUName() == null || diEx.getUName().equals("")) ? "" : "(" + diEx.getUName() + ")") + ratio;
                     item.put("MaterialName", MaterialName == null ? "" : MaterialName);
-                    item.put("Stock", depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId));
+                    BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId);
+                    item.put("Stock", stock);
                     item.put("Unit", diEx.getMunit());
+                    item.put("currentStock", diEx.getOpernumber().add(stock));
                     item.put("OperNumber", diEx.getOpernumber());
                     item.put("BasicNumber", diEx.getBasicnumber());
                     item.put("UnitPrice", diEx.getUnitprice());