|
@@ -330,7 +330,6 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods> implement
|
|
|
goodsDao.batchInsert(newGoods);
|
|
|
}
|
|
|
|
|
|
- String batchNo = idGeneratorService.generatorId("payment") + "";
|
|
|
Map<String, Integer> existsSnIdMap = existsGoods.stream().collect(Collectors.toMap(Goods::getSn, g -> g.getId()));
|
|
|
Map<String, Integer> newSnIdMap = newGoods.stream().collect(Collectors.toMap(Goods::getSn, g -> g.getId(), (v1, v2)->v1));
|
|
|
existsSnIdMap.putAll(newSnIdMap);
|
|
@@ -346,6 +345,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods> implement
|
|
|
gp.setStockCount(goods.getStockCount());
|
|
|
gp.setTaxStockCount(goods.getTaxStockCount());
|
|
|
gp.setOperatorId(operatorId);
|
|
|
+ String batchNo = idGeneratorService.generatorId("payment") + "";
|
|
|
gp.setBatchNo(batchNo);
|
|
|
goodsProcurements.add(gp);
|
|
|
}
|