From 6b4f8b26595dc8f95331d2eb75ba059269c797c4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 16:31:12 +0800
Subject: [PATCH] 小程序产量统计相同品种合并

---
 src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
index 83b8eee..bbab6d4 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -105,8 +105,13 @@
 			String s = specs + dic1 + "/" + dic2;
 			//出库
 			if (pages.getRecords().get(i).getStockType1() == 0) {
-				String count = "-" + pages.getRecords().get(i).getAmount1() + dic2;
-				pages.getRecords().get(i).setCount(count);
+				if (pages.getRecords().get(i).getType1().equals("4")){
+					String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
+					pages.getRecords().get(i).setCount(count);
+				}else {
+					String count = "-" + pages.getRecords().get(i).getAmount1() + dic2;
+					pages.getRecords().get(i).setCount(count);
+				}
 			} else {
 				String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
 				pages.getRecords().get(i).setCount(count);

--
Gitblit v1.9.3