1

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageBgzzServiceImpl.java

@@ -19,6 +19,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import com.chinaitop.depot.keeperAccount.mapper.StorageBgzzMapper;
 import com.chinaitop.depot.keeperAccount.model.BgzzListObject;
@@ -41,6 +42,23 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 	@Resource
 	private BgzzUtilsServiceImpl bgzzUtilsServiceImpl;
 
+	public StorageBgzz queryBgzzDataType1(StorageFcbgz fcbgz) {
+		StorageBgzzExample example = new StorageBgzzExample();
+		StorageBgzzExample.Criteria criteria = example.createCriteria();
+		criteria.andOrgIdEqualTo(Integer.parseInt(fcbgz.getOrgId()));
+		criteria.andDataTypeEqualTo(StorageFcbgzUtils.DATA_TYPE_1);
+		criteria.andJzndEqualTo(fcbgz.getJznd());
+		criteria.andJzyfEqualTo(fcbgz.getSjfm());
+		criteria.andLyxzEqualTo(fcbgz.getLyxz());
+		criteria.andYwlxEqualTo(fcbgz.getYwlx());
+		List<StorageBgzz> list = storageBgzzMapper.selectByExample(example);
+		StorageBgzz storageBgzz = null;
+		if (null != list && list.size() > 0) {//修改
+			storageBgzz = list.get(0);
+		}
+		return storageBgzz;
+	}
+	
 	@Override
 	public void saveOrUpdateBgzzDataType0(StorageFcbgz fcbgz) throws Exception {
 		StorageBgzzExample example = new StorageBgzzExample();
@@ -57,6 +75,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 		String lspz = fcbgz.getPz().toString();
 		if (null != list && list.size() > 0) {//修改
 			storageBgzz = list.get(0);
+			StorageBgzz hzz_storageBgzz = queryBgzzDataType1(fcbgz);//查询合计行的库存数量
 			//收入差=收入数量-支出数量
 			BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).setScale(3, BigDecimal.ROUND_DOWN);
 			if ("3164".equals(lspz)) {//小麦
@@ -66,9 +85,12 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 				storageBgzz.setXmZcsl(zcsl);
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
 				//库存数量=原库存数量+收入差
-				BigDecimal kcsl = storageBgzz.getXmKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
+				//BigDecimal kcsl = storageBgzz.getXmKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
+				//storageBgzz.setXmKcsl(kcsl);
+				if (!ObjectUtils.isEmpty(hzz_storageBgzz)) {
+					storageBgzz.setXmKcsl(hzz_storageBgzz.getXmKcsl());
+				}
 				
-				storageBgzz.setXmKcsl(kcsl);
 			} else if ("3166".equals(lspz)) {//稻谷
 				BigDecimal srsl = fcbgz.getSrsl().add(storageBgzz.getDgSrsl()).setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setDgSrsl(srsl);
@@ -76,8 +98,11 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 				storageBgzz.setDgZcsl(zcsl);
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
 				//库存数量=原库存数量+收入差
-				BigDecimal kcsl = storageBgzz.getDgKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
-				storageBgzz.setDgKcsl(kcsl);
+				//BigDecimal kcsl = storageBgzz.getDgKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
+				//storageBgzz.setDgKcsl(kcsl);
+				if (!ObjectUtils.isEmpty(hzz_storageBgzz)) {
+					storageBgzz.setDgKcsl(hzz_storageBgzz.getDgKcsl());
+				}
 			} else if ("7144".equals(lspz)) {//原油
 				BigDecimal srsl = fcbgz.getSrsl().add(storageBgzz.getDdyySrsl()).setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setDdyySrsl(srsl);
@@ -85,8 +110,11 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 				storageBgzz.setDdyyZcsl(zcsl);
 				//BigDecimal kcsl = fcbgzUtilsServiceImpl.findConditionKcsl(fcbgz);
 				//库存数量=原库存数量+收入差
-				BigDecimal kcsl = storageBgzz.getDdyyKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
-				storageBgzz.setDdyyKcsl(kcsl);
+				//BigDecimal kcsl = storageBgzz.getDdyyKcsl().add(src).setScale(3, BigDecimal.ROUND_DOWN);
+				//storageBgzz.setDdyyKcsl(kcsl);
+				if (!ObjectUtils.isEmpty(hzz_storageBgzz)) {
+					storageBgzz.setDdyyKcsl(hzz_storageBgzz.getDdyyKcsl());
+				}
 			}
 
 			BigDecimal xj = storageBgzz.getXmKcsl().add(storageBgzz.getDgKcsl()).add(storageBgzz.getDdyyKcsl()).setScale(3, BigDecimal.ROUND_DOWN);
@@ -109,7 +137,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 			BigDecimal val = new BigDecimal(0);
 
 			//收入差(取绝对值)=收入数量-支出数量
-			BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
+			//BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
 			if ("3164".equals(lspz)) {//小麦
 				storageBgzz.setXmSrsl(fcbgz.getSrsl());
 				storageBgzz.setXmZcsl(fcbgz.getZcsl());
@@ -177,29 +205,23 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 			//查询这一年这个月的普通账数据
 			List<StorageBgzz> ydlist = bgzzUtilsServiceImpl.findConditionJzyf(fcbgz, StorageFcbgzUtils.DATA_TYPE_0);
 			if ("3164".equals(lspz)) {//小麦
-				BigDecimal srsl = ydlist.stream().map(StorageBgzz::getXmSrsl).reduce(BigDecimal.ZERO, BigDecimal::add);
-				storageBgzz.setXmSrsl(srsl);
-				BigDecimal zcsl = ydlist.stream().map(StorageBgzz::getXmZcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
-				storageBgzz.setXmZcsl(zcsl);
-				BigDecimal kcsl = ydlist.stream().map(StorageBgzz::getXmKcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+				storageBgzz.setXmSrsl(storageBgzz.getXmSrsl().add(fcbgz.getSrsl()).setScale(3, BigDecimal.ROUND_DOWN));
+				storageBgzz.setXmZcsl(storageBgzz.getXmZcsl().add(fcbgz.getZcsl()).setScale(3, BigDecimal.ROUND_DOWN));
+				BigDecimal kcsl = storageBgzz.getXmSrsl().subtract(storageBgzz.getXmZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setXmKcsl(kcsl);
 			}
 
 			if ("3166".equals(lspz)) {//稻谷
-				BigDecimal srsl = ydlist.stream().map(StorageBgzz::getDgSrsl).reduce(BigDecimal.ZERO, BigDecimal::add);
-				storageBgzz.setDgSrsl(srsl);
-				BigDecimal zcsl = ydlist.stream().map(StorageBgzz::getDgZcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
-				storageBgzz.setDgZcsl(zcsl);
-				BigDecimal kcsl = ydlist.stream().map(StorageBgzz::getDgKcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+				storageBgzz.setDgSrsl(storageBgzz.getDgSrsl().add(fcbgz.getSrsl()).setScale(3, BigDecimal.ROUND_DOWN));
+				storageBgzz.setDgZcsl(storageBgzz.getDgZcsl().add(fcbgz.getZcsl()).setScale(3, BigDecimal.ROUND_DOWN));
+				BigDecimal kcsl = storageBgzz.getDgSrsl().subtract(storageBgzz.getDgZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setDgKcsl(kcsl);
 			}
 
 			if ("7144".equals(lspz)) {//原油
-				BigDecimal srsl = ydlist.stream().map(StorageBgzz::getDdyySrsl).reduce(BigDecimal.ZERO, BigDecimal::add);
-				storageBgzz.setDdyySrsl(srsl);
-				BigDecimal zcsl = ydlist.stream().map(StorageBgzz::getDdyyZcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
-				storageBgzz.setDdyyZcsl(zcsl);
-				BigDecimal kcsl = ydlist.stream().map(StorageBgzz::getDdyyKcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+				storageBgzz.setDdyySrsl(storageBgzz.getDdyySrsl().add(fcbgz.getSrsl()).setScale(3, BigDecimal.ROUND_DOWN));
+				storageBgzz.setDdyyZcsl(storageBgzz.getDdyySrsl().add(fcbgz.getSrsl()).setScale(3, BigDecimal.ROUND_DOWN));
+				BigDecimal kcsl = storageBgzz.getDdyySrsl().subtract(storageBgzz.getDdyyZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setDdyyKcsl(kcsl);
 			}
 
@@ -210,7 +232,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 			storageBgzzMapper.updateByPrimaryKey(storageBgzz);
 			
 		} else {
-			//新增普通账数据
+			//新增合计账数据
 			storageBgzz = new StorageBgzz();
 			storageBgzz.setId(UUID.randomUUID().toString().replace("-", ""));
 			storageBgzz.setOrgId(Integer.parseInt(fcbgz.getOrgId()));
@@ -220,7 +242,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 
 			BigDecimal val = new BigDecimal(0);
 
-			BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
+			//BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
 			if ("3164".equals(lspz)) {//小麦
 				storageBgzz.setXmSrsl(fcbgz.getSrsl());
 				storageBgzz.setXmZcsl(fcbgz.getZcsl());
@@ -282,7 +304,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 				storageBgzz.setXmSrsl(srsl);
 				BigDecimal zcsl = ydlist.stream().map(StorageBgzz::getXmZcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
 				storageBgzz.setXmZcsl(zcsl);
-				BigDecimal kcsl = ydlist.stream().map(StorageBgzz::getXmKcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+				BigDecimal kcsl = srsl.subtract(zcsl).abs().setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setXmKcsl(kcsl);
 			}
 			if ("3166".equals(lspz)) {//稻谷
@@ -290,7 +312,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 				storageBgzz.setDgSrsl(srsl);
 				BigDecimal zcsl = ydlist.stream().map(StorageBgzz::getDgZcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
 				storageBgzz.setDgZcsl(zcsl);
-				BigDecimal kcsl = ydlist.stream().map(StorageBgzz::getDgKcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+				BigDecimal kcsl = srsl.subtract(zcsl).abs().setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setDgKcsl(kcsl);
 			}
 			if ("7144".equals(lspz)) {//原油
@@ -298,7 +320,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 				storageBgzz.setDdyySrsl(srsl);
 				BigDecimal zcsl = ydlist.stream().map(StorageBgzz::getDdyyZcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
 				storageBgzz.setDdyyZcsl(zcsl);
-				BigDecimal kcsl = ydlist.stream().map(StorageBgzz::getDdyyKcsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+				BigDecimal kcsl = srsl.subtract(zcsl).abs().setScale(3, BigDecimal.ROUND_DOWN);
 				storageBgzz.setDdyyKcsl(kcsl);
 			}
 
@@ -317,7 +339,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 
 			BigDecimal val = new BigDecimal(0);
 
-			BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
+			//BigDecimal src = fcbgz.getSrsl().subtract(fcbgz.getZcsl()).abs().setScale(3, BigDecimal.ROUND_DOWN);
 			if ("3164".equals(lspz)) {//小麦
 				storageBgzz.setXmSrsl(fcbgz.getSrsl());
 				storageBgzz.setXmZcsl(fcbgz.getZcsl());

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageFcbgzServiceImpl.java

@@ -222,10 +222,10 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		if (StringUtils.isNotBlank(storageFcbgz.getShr())) {
 			/* 普通账，审核后给总账表插入数据 */
 			if (storageFcbgz.getDataType().equals(StorageFcbgzUtils.DATA_TYPE_0)) {
+				//先新增或更新月合计账数据
+				storageBgzzService.saveOrUpdateBgzzDataType1(storageFcbgz);
 				//新增普通账数据
 				storageBgzzService.saveOrUpdateBgzzDataType0(storageFcbgz);
-				//新增或更新月合计账数据
-				storageBgzzService.saveOrUpdateBgzzDataType1(storageFcbgz);
 				//新增或更新年结转账数据
 				storageBgzzService.saveOrUpdateBgzzDataType2(storageFcbgz);
 			}