Index: ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/WriteBackInventoryDaoImpl.java =================================================================== diff -u -r20189 -r20229 --- ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/WriteBackInventoryDaoImpl.java (.../WriteBackInventoryDaoImpl.java) (revision 20189) +++ ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/WriteBackInventoryDaoImpl.java (.../WriteBackInventoryDaoImpl.java) (revision 20229) @@ -189,7 +189,7 @@ boolean existsInMapList = false; for(Map map : writeBackDataMapList){ //按sourceId与batchId进行数量汇总合并 - if(map.get("sourceId").longValue() == disposableGoods.getIdFromHisSync().longValue() || map.get("batchId").longValue() == batchIdFromHisSync.longValue()){ + if(map.get("sourceId").longValue() == disposableGoods.getIdFromHisSync().longValue() && map.get("batchId").longValue() == batchIdFromHisSync.longValue()){ map.put("amount", map.get("amount") + disposableGoodsStorageAdjustVo.getAdjustAmount()); existsInMapList = true; break;