From cd92814ff61edd649999b3d6390a3573b347d2d9 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Wed, 30 Nov 2022 15:19:45 +0800
Subject: [PATCH] 2

---
 .../InventoryInformationService.java          | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java
index 17060f37..629783f0 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java
@@ -372,10 +372,10 @@ public class InventoryInformationService extends MybatisBaseService<InventoryInf
 		String newInventory = ii.getNewInventory();//新的库存数
 		String newValue = ii.getNewValue();//新的货值
 		ii.getDeviations();//偏差值
-		Integer integer = Integer.valueOf(newInventory);
-		Integer integer1 = Integer.valueOf(number);
-		integer=integer+integer1;
-		ii.setNewInventory(integer.toString());
+			BigDecimal bigDecimal1 = new BigDecimal(newInventory);
+			BigDecimal bigDecimal = new BigDecimal(number);
+			BigDecimal subtract = bigDecimal1.add(bigDecimal);
+		ii.setNewInventory(subtract.toString());
 	/*	BigDecimal bigDecimal = new BigDecimal(newValue);
 		BigDecimal bigDecimal1 = new BigDecimal(money);
 		BigDecimal add = bigDecimal.add(bigDecimal1);
@@ -436,11 +436,16 @@ public class InventoryInformationService extends MybatisBaseService<InventoryInf
 			ii.setProdBarCode(""); // 商品条码
 			ii.setProdName(proName); // 商品名称
 			ii.setWarehouseType(""); // 仓库类型
+			ii.setNewInventory("-"+number);//新的库存数  根据入库单 出库单、销售数据进行维护的
 			ii.setProdNum("-"+number); // 商品数量
+			if(number.indexOf("-")>=0){
+				ii.setProdNum(number); // 商品数量
+				ii.setNewInventory(number);//新的库存数  根据入库单 出库单、销售数据进行维护的
+			}
 			ii.setProdValue(""); // 商品货值
 			ii.setSuppliderSid(""); // 供应商
 			ii.setSuppliderName(""); // 供应商
-			ii.setNewInventory("-"+number);//新的库存数  根据入库单 出库单、销售数据进行维护的
+
 			ii.setNewValue("");//新的货值  根据入库单 出库单、销售数据进行维护的
 			ii.setDeviations("");//偏差数量 维护盘库后与系统中偏差的数值
 			baseMapper.insert(ii);
@@ -448,10 +453,10 @@ public class InventoryInformationService extends MybatisBaseService<InventoryInf
 			String newInventory = ii.getNewInventory();//新的库存数
 			String newValue = ii.getNewValue();//新的货值
 			ii.getDeviations();//偏差值
-			Integer integer = Integer.valueOf(newInventory);
-			Integer integer1 = Integer.valueOf(number);
-			integer = integer - integer1;
-			ii.setNewInventory(integer.toString());
+			BigDecimal bigDecimal1 = new BigDecimal(newInventory);
+			BigDecimal bigDecimal = new BigDecimal(number);
+			BigDecimal subtract = bigDecimal1.subtract(bigDecimal);
+			ii.setNewInventory(subtract.toString());
 		/*BigDecimal bigDecimal = new BigDecimal(newValue);
 		BigDecimal bigDecimal1 = new BigDecimal(money);
 		BigDecimal subtract = bigDecimal.subtract(bigDecimal1);