fanxw 1 gadu atpakaļ
vecāks
revīzija
5abf3940e6

+ 2 - 6
src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageBgzzServiceImpl.java

@@ -57,14 +57,14 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
57
 		String lspz = fcbgz.getPz().toString();
57
 		String lspz = fcbgz.getPz().toString();
58
 		if (null != list && list.size() > 0) {//修改
58
 		if (null != list && list.size() > 0) {//修改
59
 			storageBgzz = list.get(0);
59
 			storageBgzz = list.get(0);
60
+			//收入差=收入数量-支出数量
61
+			BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
60
 			if ("3164".equals(lspz)) {//小麦
62
 			if ("3164".equals(lspz)) {//小麦
61
 				BigDecimal srsl = fcbgz.getSrsl().add(storageBgzz.getXmSrsl()).setScale(3, BigDecimal.ROUND_DOWN);
63
 				BigDecimal srsl = fcbgz.getSrsl().add(storageBgzz.getXmSrsl()).setScale(3, BigDecimal.ROUND_DOWN);
62
 				storageBgzz.setXmSrsl(srsl);
64
 				storageBgzz.setXmSrsl(srsl);
63
 				BigDecimal zcsl = fcbgz.getZcsl().add(storageBgzz.getXmZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
65
 				BigDecimal zcsl = fcbgz.getZcsl().add(storageBgzz.getXmZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
64
 				storageBgzz.setXmZcsl(zcsl);
66
 				storageBgzz.setXmZcsl(zcsl);
65
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
67
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
66
-				//收入差=收入数量-支出数量
67
-				BigDecimal src = srsl.subtract(zcsl).setScale(3, BigDecimal.ROUND_DOWN);
68
 				//库存数量=原库存数量+收入差
68
 				//库存数量=原库存数量+收入差
69
 				BigDecimal kcsl = storageBgzz.getXmKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
69
 				BigDecimal kcsl = storageBgzz.getXmKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
70
 				
70
 				
@@ -75,8 +75,6 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
75
 				BigDecimal zcsl = fcbgz.getZcsl().add(storageBgzz.getDgZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
75
 				BigDecimal zcsl = fcbgz.getZcsl().add(storageBgzz.getDgZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
76
 				storageBgzz.setDgZcsl(zcsl);
76
 				storageBgzz.setDgZcsl(zcsl);
77
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
77
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
78
-				//收入差=收入数量-支出数量
79
-				BigDecimal src = srsl.subtract(zcsl).setScale(3, BigDecimal.ROUND_DOWN);
80
 				//库存数量=原库存数量+收入差
78
 				//库存数量=原库存数量+收入差
81
 				BigDecimal kcsl = storageBgzz.getDgKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
79
 				BigDecimal kcsl = storageBgzz.getDgKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
82
 				storageBgzz.setDgKcsl(kcsl);
80
 				storageBgzz.setDgKcsl(kcsl);
@@ -86,8 +84,6 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
86
 				BigDecimal zcsl = fcbgz.getZcsl().add(storageBgzz.getDdyyZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
84
 				BigDecimal zcsl = fcbgz.getZcsl().add(storageBgzz.getDdyyZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
87
 				storageBgzz.setDdyyZcsl(zcsl);
85
 				storageBgzz.setDdyyZcsl(zcsl);
88
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
86
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
89
-				//收入差=收入数量-支出数量
90
-				BigDecimal src = srsl.subtract(zcsl).setScale(3, BigDecimal.ROUND_DOWN);
91
 				//库存数量=原库存数量+收入差
87
 				//库存数量=原库存数量+收入差
92
 				BigDecimal kcsl = storageBgzz.getDdyyKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
88
 				BigDecimal kcsl = storageBgzz.getDdyyKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
93
 				storageBgzz.setDdyyKcsl(kcsl);
89
 				storageBgzz.setDdyyKcsl(kcsl);