品名代码增加单价和单位

src/main/java/com/jeeplus/modules/warehouse/goods/entity/GoodsInfo.java

@@ -28,6 +28,7 @@ public class GoodsInfo extends DataEntity<GoodsInfo> {
 	private Goods goods;		// 主表ID 父类
 	private String qrInterval; // 物资编码区间
 	private BigDecimal amount; // 单价
+    public BigDecimal infoSum; // 总价
 
 	private QrCode qrCode; // 二维码（xml中无关联查询）
 	private List<String> modelList; // 查询时使用的属性
@@ -119,4 +120,12 @@ public class GoodsInfo extends DataEntity<GoodsInfo> {
 	public void setModelList(List<String> modelList) {
 		this.modelList = modelList;
 	}
+
+    public BigDecimal getInfoSum() {
+        return infoSum;
+    }
+
+    public void setInfoSum(BigDecimal infoSum) {
+        this.infoSum = infoSum;
+    }
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/goods/mapper/xml/GoodsInfoMapper.xml

@@ -10,6 +10,7 @@
 		a.num AS "num",
 		a.remarks AS "remarks",
 		a.amount as "amount",
+		a.info_sum as "infoSum",
 		a.qr_interval AS "qrInterval",
 		a.goods_id AS "goods.id",
 		a.create_by AS "createBy.id",
@@ -101,6 +102,7 @@
 			num,
 			remarks,
 			amount,
+			info_sum,
 			qr_interval,
 			goods_id,
 			create_by,
@@ -116,6 +118,7 @@
 			#{num},
 			#{remarks},
 			#{amount},
+			#{infoSum},
 			#{qrInterval},
 			#{goods.id},
 			#{createBy.id},
@@ -134,6 +137,7 @@
 			num = #{num},
 			remarks = #{remarks},
 			amount = #{amount},
+			info_sum = #{infoSum},
 			qr_interval = #{qrInterval},
 			goods_id = #{goods.id},
 			update_by = #{updateBy.id},

src/main/java/com/jeeplus/modules/warehouse/materialtype/mapper/xml/MaterialTypeMapper.xml

@@ -121,7 +121,9 @@
 			name,
 			sort,
 			code,
-			last
+			last,
+			amount,
+			unit
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -135,7 +137,9 @@
 			#{name},
 			#{sort},
 			#{code},
-			#{last}
+			#{last},
+			#{amount},
+			#{unit}
 		)
 	</insert>
 	
@@ -149,7 +153,9 @@
 			name = #{name},
 			sort = #{sort},
 			code = #{code},
-			last = #{last}
+			last = #{last},
+			amount = #{amount},
+			unit = #{unit}
 		WHERE id = #{id}
 	</update>
 	

src/main/java/com/jeeplus/modules/warehouse/storage/entity/StorageInfo.java

@@ -32,6 +32,7 @@ public class StorageInfo extends DataEntity<StorageInfo> {
 	private String warehouseIds; // 仓库id集合
 	private BigDecimal amount; // 单价
 	private int num; // 数量
+	private BigDecimal infoSum; // 总价
 
 	private List<Shelves> shelvesList;		// 货架id
 	private List<Warehouse> warehouseList; // 仓库外键
@@ -150,4 +151,12 @@ public class StorageInfo extends DataEntity<StorageInfo> {
 	public void setWarehouseList(List<Warehouse> warehouseList) {
 		this.warehouseList = warehouseList;
 	}
+
+	public BigDecimal getInfoSum() {
+		return infoSum;
+	}
+
+	public void setInfoSum(BigDecimal infoSum) {
+		this.infoSum = infoSum;
+	}
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/storage/service/StorageService.java

@@ -94,15 +94,8 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 					storageInfoMapper.insert(storageInfo);
 
 					// 计算需要变更的总价格
-					money = money.subtract(goodsInfo.getAmount());
-					// 计算货品明细中的需要变更的数量
-					Integer count = map.get(goodsInfo.getId());
-					if (null == count) {
-						count = -1;
-					} else {
-						count --;
-					}
-					map.put(goodsInfo.getId(), count);
+					money = money.subtract(goodsInfo.getInfoSum());
+
 
 					// 更改二维码状态为已入库
 					QrCode qrCode = qrCodeMapper.get(storageInfo.getQrCode().getId());
@@ -115,7 +108,7 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 				}
 			}else{
 				storageInfoMapper.delete(storageInfo);
-				money = money.add(goodsInfo.getAmount());
+				money = money.add(goodsInfo.getAmount().multiply(new BigDecimal(goodsInfo.getNum())));
 				// 计算货品明细中的需要变更的数量
 				Integer count = map.get(goodsInfo.getId());
 				if (null == count) {